diff options
3 files changed, 15 insertions, 26 deletions
diff --git a/meta/recipes-devtools/opkg/opkg/0001-Add-retry-get-lock-argument.patch b/meta/recipes-devtools/opkg/opkg/0001-Add-retry-get-lock-argument.patch index ad1d6067c1d..1e9b4893ce5 100644 --- a/meta/recipes-devtools/opkg/opkg/0001-Add-retry-get-lock-argument.patch +++ b/meta/recipes-devtools/opkg/opkg/0001-Add-retry-get-lock-argument.patch @@ -1,4 +1,4 @@ -From 23245ccab4f18d595c4d8eb0843e187a3eac7714 Mon Sep 17 00:00:00 2001 +From a87e269f4aa9843c5a44d69736f3faa223a036a0 Mon Sep 17 00:00:00 2001 From: TIm Orling <tim.orling@konsulko.com> Date: Wed, 27 Mar 2024 22:15:44 -0700 Subject: [PATCH] Add --retry-get-lock argument @@ -32,7 +32,7 @@ Signed-off-by: Tim Orling <tim.orling@konsulko.com> 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c -index 4dc777b..504fd4b 100644 +index c2e1c2f..cb6300a 100644 --- a/libopkg/opkg_conf.c +++ b/libopkg/opkg_conf.c @@ -90,6 +90,7 @@ static opkg_option_t options[] = { @@ -43,7 +43,7 @@ index 4dc777b..504fd4b 100644 #if defined(HAVE_GPGME) {"gpg_dir", OPKG_OPT_TYPE_STRING, &_conf.gpg_dir}, {"gpg_trust_level", OPKG_OPT_TYPE_STRING, &_conf.gpg_trust_level}, -@@ -660,7 +661,12 @@ int opkg_lock() +@@ -620,7 +621,12 @@ int opkg_lock() return -1; } @@ -58,10 +58,10 @@ index 4dc777b..504fd4b 100644 opkg_perror(ERROR, "Could not lock %s", opkg_config->lock_file); r = close(lock_fd); diff --git a/src/opkg.c b/src/opkg.c -index 6249fd9..e138f6f 100644 +index 0c729ff..996aac9 100644 --- a/src/opkg.c +++ b/src/opkg.c -@@ -67,6 +67,7 @@ enum { +@@ -66,6 +66,7 @@ enum { ARGS_OPT_HOST_CACHE_DIR, ARGS_OPT_SHORT_DESCRIPTION, ARGS_OPT_FIELDS_FILTER, @@ -69,7 +69,7 @@ index 6249fd9..e138f6f 100644 }; static struct option long_options[] = { -@@ -126,6 +127,8 @@ static struct option long_options[] = { +@@ -124,6 +125,8 @@ static struct option long_options[] = { {"volatile-cache", 0, 0, ARGS_OPT_VOLATILE_CACHE}, {"short-description", 0, 0, ARGS_OPT_SHORT_DESCRIPTION}, {"fields", 1, 0, ARGS_OPT_FIELDS_FILTER}, @@ -78,9 +78,9 @@ index 6249fd9..e138f6f 100644 {"verbosity", 2, 0, 'V'}, {"version", 0, 0, 'v'}, {0, 0, 0, 0} -@@ -330,6 +333,9 @@ static int args_parse_stage2(int argc, char *argv[]) +@@ -266,6 +269,9 @@ static int args_parse(int argc, char *argv[]) case ARGS_OPT_FIELDS_FILTER: - store_str_arg(&opkg_config->fields_filter, optarg); + opkg_config->fields_filter = xstrdup(optarg); break; + case ARGS_OPT_RETRY_GET_LOCK: + store_str_arg(&opkg_config->retry_get_lock = 1); @@ -88,7 +88,7 @@ index 6249fd9..e138f6f 100644 case ARGS_OPT_COMBINE: opkg_config->combine = 1; break; -@@ -442,7 +448,9 @@ static void usage() +@@ -384,7 +390,9 @@ static void usage() printf("\t automatically to satisfy dependencies\n"); printf("\t--host-cache-dir Don't place cache in offline root dir.\n"); printf("\t--volatile-cache Use volatile cache.\n"); @@ -99,6 +99,3 @@ index 6249fd9..e138f6f 100644 printf("\n"); printf(" glob could be something like 'pkgname*' '*file*' or similar\n"); --- -2.34.1 - diff --git a/meta/recipes-devtools/opkg/opkg/0001-libopkg-Use-libgen.h-to-provide-basename-API.patch b/meta/recipes-devtools/opkg/opkg/0001-libopkg-Use-libgen.h-to-provide-basename-API.patch index 61581e752b5..db46d458ff4 100644 --- a/meta/recipes-devtools/opkg/opkg/0001-libopkg-Use-libgen.h-to-provide-basename-API.patch +++ b/meta/recipes-devtools/opkg/opkg/0001-libopkg-Use-libgen.h-to-provide-basename-API.patch @@ -1,7 +1,7 @@ -From 7a1c13a48cf020c40dda1721d5c2ffd95e8e669a Mon Sep 17 00:00:00 2001 +From 76f8fe4d316232f13ee5bc4ab709d0495c348c73 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 +Subject: [PATCH] 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 @@ -15,14 +15,12 @@ dropped from string.h [1] 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 +index 8dd902d..23575b1 100644 --- a/libopkg/opkg_archive.c +++ b/libopkg/opkg_archive.c @@ -20,6 +20,7 @@ @@ -57,6 +55,3 @@ index 889c672..5254388 100644 #include <stdio.h> #include <glob.h> #include <unistd.h> --- -2.43.0 - 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 e94a4123dd8..87dfddb720a 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 @@ -1,4 +1,4 @@ -From a4628a6171f393add9a2b287483ca39bb72b4dd6 Mon Sep 17 00:00:00 2001 +From f5195d18a2e7b794510599460997cbdf0b6846c3 Mon Sep 17 00:00:00 2001 From: Jonathan Liu <net147@gmail.com> Date: Mon, 21 Sep 2015 20:23:23 +1000 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(-) diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h -index 7bca948..5a1bc44 100644 +index d13d50b..4d84b09 100644 --- a/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_CACHE_DIR VARDIR "/cache/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 */ #define OPKG_CONF_DEFAULT_DEST_NAME "root" --- -2.5.0 - |