summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlejandro del Castillo <alejandro.delcastillo@ni.com>2016-12-27 14:50:00 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-16 18:05:12 +0000
commitf7cf740fc40ee7e950db9e41670d15c6a5141f42 (patch)
tree1d7ef9011eed8ed73121087526903ae5aaaa266b
parent2f689ed92aeb4ba5c2c64f9af0f740aa49719b25 (diff)
downloadpoky-f7cf740fc40ee7e950db9e41670d15c6a5141f42.tar.gz
opkg: upgrade to v0.3.4
* Add localstatedir and sysconfdir class-native configure definitions to override OE default sysroot values. (From OE-Core rev: 3428a3d1b4d250b82582d472907fb202efe25d40) Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/opkg/opkg/0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch8
-rw-r--r--meta/recipes-devtools/opkg/opkg_0.3.4.bb (renamed from meta/recipes-devtools/opkg/opkg_0.3.3.bb)6
2 files changed, 8 insertions, 6 deletions
diff --git a/meta/recipes-devtools/opkg/opkg/0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch b/meta/recipes-devtools/opkg/opkg/0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch
index 255021b4b7..e94a4123dd 100644
--- a/meta/recipes-devtools/opkg/opkg/0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch
+++ b/meta/recipes-devtools/opkg/opkg/0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch
@@ -21,10 +21,10 @@ index 7bca948..5a1bc44 100644
21--- a/libopkg/opkg_conf.h 21--- a/libopkg/opkg_conf.h
22+++ b/libopkg/opkg_conf.h 22+++ b/libopkg/opkg_conf.h
23@@ -40,7 +40,7 @@ extern "C" { 23@@ -40,7 +40,7 @@ extern "C" {
24 #define OPKG_CONF_DEFAULT_STATUS_FILE "/var/lib/opkg/status" 24 #define OPKG_CONF_DEFAULT_STATUS_FILE VARDIR "/lib/opkg/status"
25 #define OPKG_CONF_DEFAULT_CACHE_DIR "/var/cache/opkg" 25 #define OPKG_CONF_DEFAULT_CACHE_DIR VARDIR "/cache/opkg"
26 #define OPKG_CONF_DEFAULT_CONF_FILE_DIR "/etc/opkg" 26 #define OPKG_CONF_DEFAULT_CONF_FILE_DIR SYSCONFDIR "/opkg"
27-#define OPKG_CONF_DEFAULT_LOCK_FILE "/var/run/opkg.lock" 27-#define OPKG_CONF_DEFAULT_LOCK_FILE VARDIR "/run/opkg.lock"
28+#define OPKG_CONF_DEFAULT_LOCK_FILE "/run/opkg.lock" 28+#define OPKG_CONF_DEFAULT_LOCK_FILE "/run/opkg.lock"
29 29
30 /* In case the config file defines no dest */ 30 /* In case the config file defines no dest */
diff --git a/meta/recipes-devtools/opkg/opkg_0.3.3.bb b/meta/recipes-devtools/opkg/opkg_0.3.4.bb
index bce72fcd26..5cf2facf01 100644
--- a/meta/recipes-devtools/opkg/opkg_0.3.3.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.3.4.bb
@@ -17,8 +17,8 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz
17 file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \ 17 file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \
18" 18"
19 19
20SRC_URI[md5sum] = "a4613038c8afc7d8d482f5c53f137bdf" 20SRC_URI[md5sum] = "6c52a065499056a196e0b45a27e392de"
21SRC_URI[sha256sum] = "19db9e73121a5e4c91fa228b0a6a4c55cc3591056130cfb3c66c30aa32f8d00e" 21SRC_URI[sha256sum] = "750b900b53b62a9b280b601a196f02da81091eda2f3478c509512aa5a1ec93be"
22 22
23inherit autotools pkgconfig systemd 23inherit autotools pkgconfig systemd
24 24
@@ -37,6 +37,8 @@ PACKAGECONFIG[sha256] = "--enable-sha256,--disable-sha256"
37PACKAGECONFIG[pathfinder] = "--enable-pathfinder,--disable-pathfinder,pathfinder" 37PACKAGECONFIG[pathfinder] = "--enable-pathfinder,--disable-pathfinder,pathfinder"
38PACKAGECONFIG[libsolv] = "--with-libsolv,--without-libsolv,libsolv" 38PACKAGECONFIG[libsolv] = "--with-libsolv,--without-libsolv,libsolv"
39 39
40EXTRA_OECONF_class-native = "--localstatedir=/${@os.path.relpath('${localstatedir}', '${STAGING_DIR_NATIVE}')} --sysconfdir=/${@os.path.relpath('${sysconfdir}', '${STAGING_DIR_NATIVE}')}"
41
40do_install_append () { 42do_install_append () {
41 install -d ${D}${sysconfdir}/opkg 43 install -d ${D}${sysconfdir}/opkg
42 install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf 44 install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf