mirror of
https://git.yoctoproject.org/poky
synced 2026-09-19 09:49:33 +02:00
opkg: upgrade 0.6.3 -> 0.7.0
0001-libopkg-Use-libgen.h-to-provide-basename-API.patch removed since it's included in 0.7.0 0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch refreshed for 0.7.0 (From OE-Core rev: ce1ec6ea48df3592a8251bf0c25525a400bb8d23) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
78f30270f3
commit
507cc5f96a
@@ -1,62 +0,0 @@
|
|||||||
From 7a1c13a48cf020c40dda1721d5c2ffd95e8e669a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
|
||||||
Date: Sun, 10 Dec 2023 19:39:29 -0800
|
|
||||||
Subject: [PATCH v2] libopkg: Use libgen.h to provide basename API
|
|
||||||
|
|
||||||
Also ensure that copy of filename is passed into archive_entry_set_pathname
|
|
||||||
so it can be operated upon by posix basename which expect non-const
|
|
||||||
character pointer as input.
|
|
||||||
|
|
||||||
This became evident with latest musl where basename declaration was
|
|
||||||
dropped from string.h [1]
|
|
||||||
|
|
||||||
[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
|
|
||||||
|
|
||||||
Upstream-Status: Backport [74fc3a991f974095644897d18d43846b5f359dae]
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
||||||
---
|
|
||||||
v2: Do not override basename wholesale
|
|
||||||
|
|
||||||
libopkg/opkg_archive.c | 6 ++++--
|
|
||||||
libopkg/opkg_remove.c | 1 +
|
|
||||||
2 files changed, 5 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/libopkg/opkg_archive.c b/libopkg/opkg_archive.c
|
|
||||||
index 03a4afb..b099f5b 100644
|
|
||||||
--- a/libopkg/opkg_archive.c
|
|
||||||
+++ b/libopkg/opkg_archive.c
|
|
||||||
@@ -20,6 +20,7 @@
|
|
||||||
|
|
||||||
#include <archive.h>
|
|
||||||
#include <archive_entry.h>
|
|
||||||
+#include <libgen.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <string.h>
|
|
||||||
@@ -797,8 +798,9 @@ int gz_write_archive(const char *filename, const char *gz_filename)
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Remove path hierarchy, as we are only compressing a single file */
|
|
||||||
- archive_entry_set_pathname(entry, basename(filename));
|
|
||||||
-
|
|
||||||
+ char* tmp = xstrdup(filename);
|
|
||||||
+ archive_entry_set_pathname(entry, basename(tmp));
|
|
||||||
+ free(tmp);
|
|
||||||
r = archive_write_header(a, entry);
|
|
||||||
if (r != ARCHIVE_OK) {
|
|
||||||
opkg_msg(ERROR, "Failed to create compressed file: '%s' : %s (errno=%d)",
|
|
||||||
diff --git a/libopkg/opkg_remove.c b/libopkg/opkg_remove.c
|
|
||||||
index 889c672..5254388 100644
|
|
||||||
--- a/libopkg/opkg_remove.c
|
|
||||||
+++ b/libopkg/opkg_remove.c
|
|
||||||
@@ -20,6 +20,7 @@
|
|
||||||
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
+#include <libgen.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <glob.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
--
|
|
||||||
2.43.0
|
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
From a4628a6171f393add9a2b287483ca39bb72b4dd6 Mon Sep 17 00:00:00 2001
|
From 82b29dcfe3033d8285890bf46e58f464d9944196 Mon Sep 17 00:00:00 2001
|
||||||
From: Jonathan Liu <net147@gmail.com>
|
From: Jonathan Liu <net147@gmail.com>
|
||||||
Date: Mon, 21 Sep 2015 20:23:23 +1000
|
Date: Mon, 21 Sep 2015 20:23:23 +1000
|
||||||
Subject: [PATCH] opkg_conf: create opkg.lock in /run instead of /var/run
|
Subject: [PATCH] opkg_conf: create opkg.lock in /run instead of /var/run
|
||||||
@@ -17,10 +17,10 @@ Signed-off-by: Jonathan Liu <net147@gmail.com>
|
|||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h
|
diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h
|
||||||
index 7bca948..5a1bc44 100644
|
index 3fa6ca9..b12672e 100644
|
||||||
--- a/libopkg/opkg_conf.h
|
--- a/libopkg/opkg_conf.h
|
||||||
+++ b/libopkg/opkg_conf.h
|
+++ b/libopkg/opkg_conf.h
|
||||||
@@ -40,7 +40,7 @@ extern "C" {
|
@@ -42,7 +42,7 @@ extern "C" {
|
||||||
#define OPKG_CONF_DEFAULT_STATUS_FILE VARDIR "/lib/opkg/status"
|
#define OPKG_CONF_DEFAULT_STATUS_FILE VARDIR "/lib/opkg/status"
|
||||||
#define OPKG_CONF_DEFAULT_CACHE_DIR VARDIR "/cache/opkg"
|
#define OPKG_CONF_DEFAULT_CACHE_DIR VARDIR "/cache/opkg"
|
||||||
#define OPKG_CONF_DEFAULT_CONF_FILE_DIR SYSCONFDIR "/opkg"
|
#define OPKG_CONF_DEFAULT_CONF_FILE_DIR SYSCONFDIR "/opkg"
|
||||||
@@ -29,6 +29,3 @@ index 7bca948..5a1bc44 100644
|
|||||||
|
|
||||||
/* In case the config file defines no dest */
|
/* In case the config file defines no dest */
|
||||||
#define OPKG_CONF_DEFAULT_DEST_NAME "root"
|
#define OPKG_CONF_DEFAULT_DEST_NAME "root"
|
||||||
--
|
|
||||||
2.5.0
|
|
||||||
|
|
||||||
|
|||||||
@@ -15,11 +15,10 @@ PE = "1"
|
|||||||
SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz \
|
SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz \
|
||||||
file://opkg.conf \
|
file://opkg.conf \
|
||||||
file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \
|
file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \
|
||||||
file://0001-libopkg-Use-libgen.h-to-provide-basename-API.patch \
|
|
||||||
file://run-ptest \
|
file://run-ptest \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[sha256sum] = "f3938e359646b406c40d5d442a1467c7e72357f91ab822e442697529641e06de"
|
SRC_URI[sha256sum] = "d973fd0f1568f58f87d6aecd9aa95e3e1f60214a45cee26704bf8fe757c54567"
|
||||||
|
|
||||||
# This needs to be before ptest inherit, otherwise all ptest files end packaged
|
# This needs to be before ptest inherit, otherwise all ptest files end packaged
|
||||||
# in libopkg package if OPKGLIBDIR == libdir, because default
|
# in libopkg package if OPKGLIBDIR == libdir, because default
|
||||||
Reference in New Issue
Block a user