diff options
| author | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-05 10:44:43 +0000 |
|---|---|---|
| committer | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-05 10:44:43 +0000 |
| commit | 133a146ff18363de42115e1ec4155e5c203dd152 (patch) | |
| tree | eabd3dbc45dc0cfec5b293b1934de4ca6c8d6944 | |
| parent | 5c105d9f3fd086aff195d3849dcf847d6b0bd927 (diff) | |
| download | openwrt-133a146ff18363de42115e1ec4155e5c203dd152.tar.gz openwrt-133a146ff18363de42115e1ec4155e5c203dd152.zip | |
set Attitude Adjustment specifc names and urls
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@33627 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | feeds.conf.default | 4 | ||||
| -rw-r--r-- | include/version.mk | 6 | ||||
| -rw-r--r-- | package/base-files/image-config.in | 3 |
3 files changed, 7 insertions, 6 deletions
diff --git a/feeds.conf.default b/feeds.conf.default index 518bf68ad..9dd141423 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,6 +1,6 @@ -src-svn packages svn://svn.openwrt.org/openwrt/packages +src-svn packages svn://svn.openwrt.org/openwrt/branches/packages_12.09 src-svn xwrt http://x-wrt.googlecode.com/svn/trunk/package -src-svn luci http://svn.luci.subsignal.org/luci/trunk/contrib/package +src-svn luci http://svn.luci.subsignal.org/luci/branches/luci-0.11/contrib/package #src-svn phone svn://svn.openwrt.org/openwrt/feeds/phone #src-svn efl svn://svn.openwrt.org/openwrt/feeds/efl #src-svn xorg svn://svn.openwrt.org/openwrt/feeds/xorg diff --git a/include/version.mk b/include/version.mk index 2bf709e56..7aa50186c 100644 --- a/include/version.mk +++ b/include/version.mk @@ -15,16 +15,16 @@ PKG_CONFIG_DEPENDS += \ CONFIG_VERSION_DIST VERSION_NUMBER:=$(call qstrip,$(CONFIG_VERSION_NUMBER)) -VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),$(REVISION)) +VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),12.09-beta2) VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_NUMBER)) -VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),Bleeding Edge) +VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),Attitude Adjustment) VERSION_NICK:=$(call qstrip,$(CONFIG_VERSION_NICK)) VERSION_NICK:=$(if $(VERSION_NICK),$(VERSION_NICK),$(RELEASE)) VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO)) -VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/snapshots/trunk/%T/packages) +VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/attitude_adjustment/12.09-beta2/%S/packages) VERSION_DIST:=$(call qstrip,$(CONFIG_VERSION_DIST)) VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt) diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in index ac08c8da7..2e15d1608 100644 --- a/package/base-files/image-config.in +++ b/package/base-files/image-config.in @@ -153,6 +153,7 @@ menuconfig VERSIONOPT config VERSION_NICK string prompt "Release version nickname" if VERSIONOPT + default "Attitude Adjustment" if VERSIONOPT help This is the release codename embedded in the image. If unspecified, it defaults to the name of source branch. @@ -168,7 +169,7 @@ menuconfig VERSIONOPT config VERSION_REPO string prompt "Release repository" if VERSIONOPT - default "http://downloads.openwrt.org/snapshots/trunk/%T/packages" if VERSIONOPT + default "http://downloads.openwrt.org/attitude_adjustment/12.09-beta2/%S/packages" if VERSIONOPT help This is the repository address embedded in the image, it defaults to the trunk snapshot repo; the url may contain the following placeholders: |