diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-04-06 12:04:42 (EDT) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-04-06 12:04:42 (EDT) |
| commit | 3858195c0ec3432e0fd65c7c3a58e7ec01125fdb (patch) | |
| tree | 59c9b492263dc8f41c5223cd6a45bfbb2a7e539b | |
| parent | 24df767c50c85beb95a5cba9036e1641745c461c (diff) | |
patches: Allow overriding opkg state dir prefix
| -rw-r--r-- | patches/0002-build-Allow-overriding-opkg-state-dir-prefix.patch | 34 | ||||
| -rw-r--r-- | patches/0003-cli-Optionally-enforce-argument-to-upgrade-command.patch (renamed from patches/0002-cli-Optionally-enforce-argument-to-upgrade-command.patch) | 0 | ||||
| -rw-r--r-- | patches/0004-libopkg-Fix-segfault-on-trailing-comma-in-deps.patch (renamed from patches/0003-libopkg-Fix-segfault-on-trailing-comma-in-deps.patch) | 0 |
3 files changed, 34 insertions, 0 deletions
diff --git a/patches/0002-build-Allow-overriding-opkg-state-dir-prefix.patch b/patches/0002-build-Allow-overriding-opkg-state-dir-prefix.patch new file mode 100644 index 0000000..9c3a728 --- /dev/null +++ b/patches/0002-build-Allow-overriding-opkg-state-dir-prefix.patch @@ -0,0 +1,34 @@ +From 2b29cbc39554ddae21461eaf781b944eddfc7d9d Mon Sep 17 00:00:00 2001 +From: Patrick McDermott <patrick.mcdermott@libiquity.com> +Date: Sat, 6 Apr 2019 12:00:22 -0400 +Subject: [PATCH 2/2] build: Allow overriding opkg state dir prefix + +Signed-off-by: Patrick McDermott <patrick.mcdermott@libiquity.com> +--- + CMakeLists.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5ad0b36..9acd6b4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,6 +8,7 @@ SET(HOST_CPU "" CACHE STRING "Override Host CPU") + SET(BUILD_CPU "" CACHE STRING "Override Host CPU") + SET(CONF_FILE "/etc/opkg.conf" CACHE STRING "Override default configuration file path") + 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(VERSION "" CACHE STRING "Override version") + +@@ -41,7 +42,7 @@ ADD_DEFINITIONS(-Os -Wall --std=gnu99 -g3 -Wmissing-declarations + -DOPKGETCDIR="/etc" + -DOPKGCONFFILE="${CONF_FILE}" + -DOPKGLOCKFILE="${LOCK_FILE}" +- -DOPKGLIBDIR="/usr/lib" ++ -DOPKGLIBDIR="${STATE_DIR_PREFIX}" + -DHOST_CPU_STR="${HOST_CPU}" + -DBUILD_CPU=${BUILD_CPU} + -DPATH_SPEC="${PATH_SPEC}" +-- +2.11.0 + diff --git a/patches/0002-cli-Optionally-enforce-argument-to-upgrade-command.patch b/patches/0003-cli-Optionally-enforce-argument-to-upgrade-command.patch index 9765026..9765026 100644 --- a/patches/0002-cli-Optionally-enforce-argument-to-upgrade-command.patch +++ b/patches/0003-cli-Optionally-enforce-argument-to-upgrade-command.patch diff --git a/patches/0003-libopkg-Fix-segfault-on-trailing-comma-in-deps.patch b/patches/0004-libopkg-Fix-segfault-on-trailing-comma-in-deps.patch index 56181dd..56181dd 100644 --- a/patches/0003-libopkg-Fix-segfault-on-trailing-comma-in-deps.patch +++ b/patches/0004-libopkg-Fix-segfault-on-trailing-comma-in-deps.patch |