patches/0001-cli-Set-default-conf-file-path-in-build-system.patch: Drop

3 files changed, 2 insertions, 48 deletions

diff --git a/build b/build
index f1e5d9e..40204ea 100755
--- a/build
+++ b/build
@@ -12,7 +12,6 @@ build:
 	(cd src && cmake \
 		-D CMAKE_VERBOSE_MAKEFILE:BOOL=ON \
 		-D CMAKE_INSTALL_PREFIX:PATH=/usr \
-		-D CONF_FILE:STRING=/etc/opkg/opkg.conf \
 		-D LOCK_FILE:STRING=/var/lib/opkg/lock \
 		-D STATE_DIR_PREFIX:STRING=/var/lib \
 		-D STATIC_UBOX:BOOL=ON \
diff --git a/changelog b/changelog
index 95f94d0..e548b72 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,8 @@ opkg-lede (0+git20190131.d4ba162-6) trunk
   * opkg-lede: Replace opkg-key with opkg-cert, and provide a
     "/usr/sbin/opkg-key" link.
   * opkg-lede: Drop "Replaces" field and simplify "Conflicts" field.
+  * Drop patch to change default configuration file path, and just use
+    "/etc/opkg.conf".
 
  -- Patrick McDermott <patrick.mcdermott@libiquity.com>  Wed, 17 Apr 2019 19:01:24 -0400
 
diff --git a/patches/0001-cli-Set-default-conf-file-path-in-build-system.patch b/patches/0001-cli-Set-default-conf-file-path-in-build-system.patch
deleted file mode 100644
index 93a6cc2..0000000
--- a/patches/0001-cli-Set-default-conf-file-path-in-build-system.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 59c7a3653d360ec25a7e6104dd83e6bd3c814865 Mon Sep 17 00:00:00 2001
-From: Patrick McDermott <patrick.mcdermott@libiquity.com>
-Date: Thu, 4 Apr 2019 16:55:39 -0400
-Subject: [PATCH 1/6] cli: Set default conf file path in build system
-
-Signed-off-by: Patrick McDermott <patrick.mcdermott@libiquity.com>
----
- CMakeLists.txt | 2 ++
- src/opkg-cl.c  | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 26230b3..5ad0b36 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -6,6 +6,7 @@ INCLUDE(TestBigEndian)
- 
- 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(PATH_SPEC "/usr/sbin:/usr/bin:/sbin:/bin" CACHE STRING "Override default PATH value")
- SET(VERSION "" CACHE STRING "Override version")
-@@ -38,6 +39,7 @@ TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
- ADD_DEFINITIONS(-Os -Wall --std=gnu99 -g3 -Wmissing-declarations
- 	-DDATADIR="/usr/share"
- 	-DOPKGETCDIR="/etc"
-+	-DOPKGCONFFILE="${CONF_FILE}"
- 	-DOPKGLOCKFILE="${LOCK_FILE}"
- 	-DOPKGLIBDIR="/usr/lib"
- 	-DHOST_CPU_STR="${HOST_CPU}"
-diff --git a/src/opkg-cl.c b/src/opkg-cl.c
-index a3ea5c1..a299514 100644
---- a/src/opkg-cl.c
-+++ b/src/opkg-cl.c
-@@ -244,7 +244,7 @@ static int args_parse(int argc, char *argv[])
- 	}
- 
- 	if (!conf->conf_file && !conf->offline_root)
--		conf->conf_file = xstrdup("/etc/opkg.conf");
-+		conf->conf_file = xstrdup(OPKGCONFFILE);
- 
- 	if (parse_err)
- 		return parse_err;
--- 
-2.11.0
-