diff options
| author |   Alejandro del Castillo <alejandro.delcastillo@ni.com> | 2016-12-27 14:50:01 -0600 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-16 18:01:51 +0000 |
| commit | 60c9a970426cf9a9985fb70b4d896dc29ba2befd (patch) | |
| tree | 48e40cf0a0898e46b17c1002f09f50c581ec8a87 | |
| parent | dffbac64bbf86c91247ba7373b3b5bd6af24103f (diff) | |
| download | openembedded-core-contrib-60c9a970426cf9a9985fb70b4d896dc29ba2befd.tar.gz | |
opkg-utils: bump SRCREV to 0.3.4 tag
* Add patch that removes hardcoded installation directories.
Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
3 files changed, 35 insertions, 4 deletions
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 0000000000..6259f0086f --- /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 4dddb08c96..3824eb3b70 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 4f90bcd13a..e769a8bd10 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb @@ -7,11 +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 \ - file://0001-update-alternatives-warn-when-multiple-providers-hav.patch" + file://0001-Makefile-use-defined-bindir-and-mandir-as-installati.patch \ +" SRC_URI_append_class-native = " file://tar_ignore_error.patch" S = "${WORKDIR}/git" |