diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2012-04-12 17:31:16 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-04-12 17:31:16 +0000 |
| commit | 5d7e7f9fe46322fce0689f2184fc4928bc943898 (patch) | |
| tree | c73f1424a6aeb3e7a0184f0412973c9739b0008e /package/opkg | |
| parent | d9eb068d97eeb101c4773eab2718a61cab9346d3 (diff) | |
| download | upstream-5d7e7f9fe46322fce0689f2184fc4928bc943898.tar.gz upstream-5d7e7f9fe46322fce0689f2184fc4928bc943898.tar.bz2 upstream-5d7e7f9fe46322fce0689f2184fc4928bc943898.zip | |
[buildroot] include, base-files, opkg: introduce version configuration to override the embedded version info of generated images
- Introduce new Kconfig symbols VERSION_DIST, VERSION_NICK, VERSION_NUMBER and VERSION_REPO to specify distribution, release name, version and repository for a given build
- Introduce include/version.mk to provide common helpers for packages dealing with versions
- Make opkg use version.mk to populate the opkg.conf template
- Make base-files use version.mk to populate /etc/openwrt_version, /etc/openwrt_release and /etc/banner
The available placeholders are:
%D .. Replace with $(CONFIG_VERSION_DIST), default to "OpenWrt"
%d .. Like %D, but all characters made lowercase and spaces substituted with "_" (e.g. "openwrt")
%N .. Replace with $(CONFIG_VERSION_NICK), default to the build tree release (e.g. "Attitude Adjustment")
%n .. Like %N, but all characters made lowercase and spaces substituted with "_" (e.g. "attitude_adjustment")
%V .. Replace with $(CONFIG_VERSION_NUMBER), default to the build tree release (e.g. "r31262")
%v .. Like %V, but all characters made lowercase and spaces substituted with "_"
%C .. Replace with $(CONFIG_VERSION_NUMBER), default to "Bleeding Edge"
%c .. Like %C, but all characters made lowercase and spaces substituted with "_" (e.g. "bleeding_edge")
%U .. Replace with $(CONFIG_VERSION_REPO), default to "http://downloads.openwrt.org/snapshots/trunk/%T/packages"
%R .. Replace with the current build tree revision (e.g. "r31262" or "75488c4a05b8033cf69e91874a61852db7ba9c6c")
%T .. Replace with the current target (e.g. "ar71xx")
%S .. Replace with the current target/subtarget combo (e.g. "adm5120/router_le")
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31262 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/opkg')
| -rw-r--r-- | package/opkg/Makefile | 5 | ||||
| -rw-r--r-- | package/opkg/files/opkg.conf | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/package/opkg/Makefile b/package/opkg/Makefile index 30bf181e1a..56b4a54741 100644 --- a/package/opkg/Makefile +++ b/package/opkg/Makefile @@ -1,11 +1,12 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006-2012 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk +include $(INCLUDE_DIR)/version.mk PKG_NAME:=opkg PKG_REV:=618 @@ -69,7 +70,7 @@ define Package/opkg/install $(INSTALL_DIR) $(1)/bin $(INSTALL_DIR) $(1)/etc $(INSTALL_DATA) ./files/opkg.conf $(1)/etc/ - $(SED) 's,$$$$S,$(PKGARCH),g' $(1)/etc/opkg.conf + $(VERSION_SED) $(1)/etc/opkg.conf $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/opkg-cl $(1)/bin/opkg endef diff --git a/package/opkg/files/opkg.conf b/package/opkg/files/opkg.conf index 0e85936ba2..6fb42b7fa4 100644 --- a/package/opkg/files/opkg.conf +++ b/package/opkg/files/opkg.conf @@ -1,4 +1,4 @@ -src/gz snapshots http://downloads.openwrt.org/snapshots/trunk/$S/packages +src/gz %n %U dest root / dest ram /tmp lists_dir ext /var/opkg-lists |