* [PATCH 1/2] opkg: upgrade to v0.3.4
2016-12-27 20:49 [PATCH 0/2] opkg & opkg-utils upgrade to 0.3.4 Alejandro del Castillo
@ 2016-12-27 20:50 ` Alejandro del Castillo
2016-12-27 20:50 ` [PATCH 2/2] opkg-utils: bump SRCREV to 0.3.4 tag Alejandro del Castillo
1 sibling, 0 replies; 3+ messages in thread
From: Alejandro del Castillo @ 2016-12-27 20:50 UTC (permalink / raw)
To: openembedded-core
* Add localstatedir and sysconfdir class-native configure definitions to
override OE default sysroot values.
Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
---
...001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch | 8 ++++----
meta/recipes-devtools/opkg/{opkg_0.3.3.bb => opkg_0.3.4.bb} | 6 ++++--
2 files changed, 8 insertions(+), 6 deletions(-)
rename meta/recipes-devtools/opkg/{opkg_0.3.3.bb => opkg_0.3.4.bb} (88%)
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 255021b..e94a412 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
--- a/libopkg/opkg_conf.h
+++ b/libopkg/opkg_conf.h
@@ -40,7 +40,7 @@ extern "C" {
- #define OPKG_CONF_DEFAULT_STATUS_FILE "/var/lib/opkg/status"
- #define OPKG_CONF_DEFAULT_CACHE_DIR "/var/cache/opkg"
- #define OPKG_CONF_DEFAULT_CONF_FILE_DIR "/etc/opkg"
--#define OPKG_CONF_DEFAULT_LOCK_FILE "/var/run/opkg.lock"
+ #define OPKG_CONF_DEFAULT_STATUS_FILE VARDIR "/lib/opkg/status"
+ #define OPKG_CONF_DEFAULT_CACHE_DIR VARDIR "/cache/opkg"
+ #define OPKG_CONF_DEFAULT_CONF_FILE_DIR SYSCONFDIR "/opkg"
+-#define OPKG_CONF_DEFAULT_LOCK_FILE VARDIR "/run/opkg.lock"
+#define OPKG_CONF_DEFAULT_LOCK_FILE "/run/opkg.lock"
/* 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
similarity index 88%
rename from meta/recipes-devtools/opkg/opkg_0.3.3.bb
rename to meta/recipes-devtools/opkg/opkg_0.3.4.bb
index bce72fc..5cf2fac 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
file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \
"
-SRC_URI[md5sum] = "a4613038c8afc7d8d482f5c53f137bdf"
-SRC_URI[sha256sum] = "19db9e73121a5e4c91fa228b0a6a4c55cc3591056130cfb3c66c30aa32f8d00e"
+SRC_URI[md5sum] = "6c52a065499056a196e0b45a27e392de"
+SRC_URI[sha256sum] = "750b900b53b62a9b280b601a196f02da81091eda2f3478c509512aa5a1ec93be"
inherit autotools pkgconfig systemd
@@ -37,6 +37,8 @@ PACKAGECONFIG[sha256] = "--enable-sha256,--disable-sha256"
PACKAGECONFIG[pathfinder] = "--enable-pathfinder,--disable-pathfinder,pathfinder"
PACKAGECONFIG[libsolv] = "--with-libsolv,--without-libsolv,libsolv"
+EXTRA_OECONF_class-native = "--localstatedir=/${@os.path.relpath('${localstatedir}', '${STAGING_DIR_NATIVE}')} --sysconfdir=/${@os.path.relpath('${sysconfdir}', '${STAGING_DIR_NATIVE}')}"
+
do_install_append () {
install -d ${D}${sysconfdir}/opkg
install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 2/2] opkg-utils: bump SRCREV to 0.3.4 tag
2016-12-27 20:49 [PATCH 0/2] opkg & opkg-utils upgrade to 0.3.4 Alejandro del Castillo
2016-12-27 20:50 ` [PATCH 1/2] opkg: upgrade to v0.3.4 Alejandro del Castillo
@ 2016-12-27 20:50 ` Alejandro del Castillo
1 sibling, 0 replies; 3+ messages in thread
From: Alejandro del Castillo @ 2016-12-27 20:50 UTC (permalink / raw)
To: openembedded-core
* Add patch that removes hardcoded installation directories.
Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
---
...e-defined-bindir-and-mandir-as-installati.patch | 30 ++++++++++++++++++++++
.../opkg-utils/opkg-utils/tar_ignore_error.patch | 2 +-
meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 8 +++---
3 files changed, 36 insertions(+), 4 deletions(-)
create mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/0001-Makefile-use-defined-bindir-and-mandir-as-installati.patch
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Makefile-use-defined-bindir-and-mandir-as-installati.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Makefile-use-defined-bindir-and-mandir-as-installati.patch
new file mode 100644
index 0000000..6259f00
--- /dev/null
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Makefile-use-defined-bindir-and-mandir-as-installati.patch
@@ -0,0 +1,30 @@
+From af4a6e4666264661769e32874e9654e02e5eb019 Mon Sep 17 00:00:00 2001
+From: Alejandro del Castillo <alejandro.delcastillo@ni.com>
+Date: Thu, 22 Dec 2016 16:15:56 -0600
+Subject: [opkg-utils PATCH] Makefile: use defined bindir and mandir as
+ installation dirs
+
+Upstream-Status: Pending
+
+Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
+---
+ Makefile | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 92b45f1..9f0531c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -5,9 +5,6 @@ UTILS = opkg-build opkg-unbuild opkg-make-index opkg.py opkg-list-fields \
+ MANPAGES = opkg-build.1
+
+ DESTDIR=
+-PREFIX=/usr/local
+-bindir=$(PREFIX)/bin
+-mandir=$(PREFIX)/man
+
+ .SUFFIXES: .1
+
+--
+2.7.4
+
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch
index 4dddb08..3824eb3 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch
@@ -25,7 +25,7 @@ Index: git/opkg-build
mkdir $tmp_dir
echo $CONTROL > $tmp_dir/tarX
--( cd $pkg_dir && tar $ogargs -X $tmp_dir/tarX -cz $tarformat -f $tmp_dir/data.tar.gz . )
+-( cd $pkg_dir && tar $ogargs -X $tmp_dir/tarX -c --$compressor $tarformat -f $tmp_dir/data.tar.$cext . )
-( cd $pkg_dir/$CONTROL && tar $ogargs -cz $tarformat -f $tmp_dir/control.tar.gz . )
+
+
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
index 19a852e..457405a 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
@@ -7,10 +7,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://opkg.py;beginline=1;endline=18;md5=15917491ad6bf7acc666ca5f7cc1e083"
PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtual/update-alternatives', '', d)}"
-SRCREV = "3ffece9bf19a844edacc563aa092fd1fbfcffeee"
-PV = "0.3.2+git${SRCPV}"
+SRCREV = "9228b38a81c94bd95ada3a6334404923d67bea66"
+PV = "0.3.4+git${SRCPV}"
-SRC_URI = "git://git.yoctoproject.org/opkg-utils"
+SRC_URI = "git://git.yoctoproject.org/opkg-utils \
+ file://0001-Makefile-use-defined-bindir-and-mandir-as-installati.patch \
+"
SRC_URI_append_class-native = " file://tar_ignore_error.patch"
S = "${WORKDIR}/git"
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread