summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorAlejandro del Castillo <alejandro.delcastillo@ni.com>2018-12-26 17:59:04 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-27 22:52:58 +0000
commit7dfee9b78daa5d25551704f27d0228b2c170fbcc (patch)
treef63d456076d725fd74dba297f6dd32ea8f9e140b /meta/recipes-devtools
parentffae6c9e6c3a20ae72b9dcc7b1b2eb4cdb629574 (diff)
downloadpoky-7dfee9b78daa5d25551704f27d0228b2c170fbcc.tar.gz
opkg: upgrade to version 0.4.0
- Drop 0001-remove_maintainer_scripts-use-strict-matching.patch (From OE-Core rev: 74d3b4a199bfeae99dfbe6f23f1c3cb4bf76abff) Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/opkg/opkg/0001-remove_maintainer_scripts-use-strict-matching.patch56
-rw-r--r--meta/recipes-devtools/opkg/opkg_0.4.0.bb (renamed from meta/recipes-devtools/opkg/opkg_0.3.6.bb)5
2 files changed, 2 insertions, 59 deletions
diff --git a/meta/recipes-devtools/opkg/opkg/0001-remove_maintainer_scripts-use-strict-matching.patch b/meta/recipes-devtools/opkg/opkg/0001-remove_maintainer_scripts-use-strict-matching.patch
deleted file mode 100644
index ec160290be..0000000000
--- a/meta/recipes-devtools/opkg/opkg/0001-remove_maintainer_scripts-use-strict-matching.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1From 55c4ad666e76281bdd0db55fa6f4ab2744fea7e4 Mon Sep 17 00:00:00 2001
2From: Alejandro del Castillo <alejandro.delcastillo@ni.com>
3Date: Tue, 4 Sep 2018 18:06:00 -0500
4Subject: [PATCH] remove_maintainer_scripts: use strict matching
5
6The function is using a glob to select which metadata files needs to be
7deleted during package removal, on the info_dir. However, the glob may
8match metadata files from packages with similar names. For example,
9during removal of package glibc-binary-localedata-de-at, the current
10logic was also removing the metadata for
11glibc-binary-localedata-de-at.iso-8859-1. Add check for an exact match
12before deletion.
13
14Fixes bugzilla: 12905
15
16Upstream-Status: Submitted [https://groups.google.com/forum/#!topic/opkg-devel/Fr40Yt0NBno]
17Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
18---
19 libopkg/opkg_remove.c | 14 +++++++++++---
20 1 file changed, 11 insertions(+), 3 deletions(-)
21
22diff --git a/libopkg/opkg_remove.c b/libopkg/opkg_remove.c
23index 82125fa..3936628 100644
24--- a/libopkg/opkg_remove.c
25+++ b/libopkg/opkg_remove.c
26@@ -137,7 +137,7 @@ void remove_maintainer_scripts(pkg_t * pkg)
27 {
28 unsigned int i;
29 int err;
30- char *globpattern;
31+ char *globpattern, *filename, *lastdot;
32 glob_t globbuf;
33
34 if (opkg_config->noaction)
35@@ -151,8 +151,16 @@ void remove_maintainer_scripts(pkg_t * pkg)
36 return;
37
38 for (i = 0; i < globbuf.gl_pathc; i++) {
39- opkg_msg(INFO, "Deleting %s.\n", globbuf.gl_pathv[i]);
40- unlink(globbuf.gl_pathv[i]);
41+ filename = xstrdup(basename(globbuf.gl_pathv[i]));
42+ lastdot = strrchr(filename, '.');
43+ *lastdot = '\0';
44+ // Only delete files that match the package name (the glob may match files
45+ // with similar names)
46+ if (!strcmp(filename, pkg->name)) {
47+ opkg_msg(INFO, "Deleting %s.\n", globbuf.gl_pathv[i]);
48+ unlink(globbuf.gl_pathv[i]);
49+ }
50+ free(filename);
51 }
52 globfree(&globbuf);
53 }
54--
552.18.0
56
diff --git a/meta/recipes-devtools/opkg/opkg_0.3.6.bb b/meta/recipes-devtools/opkg/opkg_0.4.0.bb
index 6ebd58b967..9b7cf3f596 100644
--- a/meta/recipes-devtools/opkg/opkg_0.3.6.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.4.0.bb
@@ -14,11 +14,10 @@ PE = "1"
14SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz \ 14SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz \
15 file://opkg.conf \ 15 file://opkg.conf \
16 file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \ 16 file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \
17 file://0001-remove_maintainer_scripts-use-strict-matching.patch \
18" 17"
19 18
20SRC_URI[md5sum] = "79e04307f6f54db431c251772d7d987c" 19SRC_URI[md5sum] = "ae51d95fee599bb4dce08453529158f5"
21SRC_URI[sha256sum] = "f607f0e61be8cf8a3bbd0d2dccd9ec9e9b6c21dd4307b671c600d6eeaf84d30b" 20SRC_URI[sha256sum] = "f6c00515d8a2ad8f6742a8e73830315d1983ed0459cba77c4d656cfc9e7fe6fe"
22 21
23inherit autotools pkgconfig systemd 22inherit autotools pkgconfig systemd
24 23