1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
From 653d45cca7aff2ced1abc6fba4e3a71aec842abb Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Sat, 6 Apr 2019 12:53:07 -0400
Subject: [PATCH 6/6] libopkg: Add optional suffix to list files
Signed-off-by: Patrick McDermott <patrick.mcdermott@libiquity.com>
---
CMakeLists.txt | 2 ++
libopkg/opkg.c | 3 ++-
libopkg/opkg_cmd.c | 3 ++-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dfb1b81..6bf4da9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,7 @@ SET(CONF_FILE "/etc/opkg.conf" CACHE STRING "Override default configuration file
SET(LOCK_FILE "/var/lock/opkg.lock" CACHE STRING "Override lock file path")
SET(STATE_DIR_PREFIX "/usr/lib" CACHE STRING "Override opkg state directory prefix")
SET(PATH_SPEC "/usr/sbin:/usr/bin:/sbin:/bin" CACHE STRING "Override default PATH value")
+SET(LIST_FILES_SUFFIX "" CACHE STRING "Override list files suffix, e.g. .gz")
SET(VERSION "" CACHE STRING "Override version")
OPTION(STATIC_UBOX "Statically link libubox" OFF)
@@ -47,6 +48,7 @@ ADD_DEFINITIONS(-Os -Wall --std=gnu99 -g3 -Wmissing-declarations
-DHOST_CPU_STR="${HOST_CPU}"
-DBUILD_CPU=${BUILD_CPU}
-DPATH_SPEC="${PATH_SPEC}"
+ -DLIST_FILES_SUFFIX="${LIST_FILES_SUFFIX}"
-DVERSION="${VERSION}"
)
diff --git a/libopkg/opkg.c b/libopkg/opkg.c
index aba6364..09de2d6 100644
--- a/libopkg/opkg.c
+++ b/libopkg/opkg.c
@@ -537,7 +537,8 @@ opkg_update_package_lists(opkg_progress_callback_t progress_callback,
sprintf_alloc(&url, "%s/%s", src->value,
src->gzip ? "Packages.gz" : "Packages");
- sprintf_alloc(&list_file_name, "%s/%s", lists_dir, src->name);
+ sprintf_alloc(&list_file_name, "%s/%s" LIST_FILES_SUFFIX,
+ lists_dir, src->name);
if (opkg_download(url, list_file_name, 0)) {
opkg_msg(ERROR, "Couldn't retrieve %s\n", url);
diff --git a/libopkg/opkg_cmd.c b/libopkg/opkg_cmd.c
index 0a4180d..8e04b54 100644
--- a/libopkg/opkg_cmd.c
+++ b/libopkg/opkg_cmd.c
@@ -128,7 +128,8 @@ static int opkg_update_cmd(int argc, char **argv)
sprintf_alloc(&url, "%s/%s", src->value,
src->gzip ? "Packages.gz" : "Packages");
- sprintf_alloc(&list_file_name, "%s/%s", lists_dir, src->name);
+ sprintf_alloc(&list_file_name, "%s/%s" LIST_FILES_SUFFIX,
+ lists_dir, src->name);
pkglist_dl_error = 0;
if (opkg_download(url, list_file_name, 0)) {
failures++;
--
2.11.0
|
