aboutsummaryrefslogtreecommitdiffstats
path: root/package/opkg
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2009-08-10 22:38:37 +0000
committerJo-Philipp Wich <jow@openwrt.org>2009-08-10 22:38:37 +0000
commit6ccd4143eb2e40fea13b7064ee9e9c645b0c4572 (patch)
tree06f003ee20263c352b3214a0939ba4fc330175fe /package/opkg
parentece3bdcdd6c1ceed6a841d3e2ff5600209b1f600 (diff)
downloadupstream-6ccd4143eb2e40fea13b7064ee9e9c645b0c4572.tar.gz
upstream-6ccd4143eb2e40fea13b7064ee9e9c645b0c4572.tar.bz2
upstream-6ccd4143eb2e40fea13b7064ee9e9c645b0c4572.zip
opkg: fix duplicate parsing of config file, move opkg.conf back to /etc, bump package revision, thanks kupseoft
SVN-Revision: 17209
Diffstat (limited to 'package/opkg')
-rw-r--r--package/opkg/Makefile10
-rw-r--r--package/opkg/patches/001-fix-double-parsing.patch12
2 files changed, 17 insertions, 5 deletions
diff --git a/package/opkg/Makefile b/package/opkg/Makefile
index 249299fc70..e67584764a 100644
--- a/package/opkg/Makefile
+++ b/package/opkg/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=opkg
PKG_REV:=215
PKG_VERSION:=$(PKG_REV)
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE_PROTO:=svn
PKG_SOURCE_VERSION:=$(PKG_REV)
@@ -37,7 +37,7 @@ define Package/opkg/description
endef
define Package/opkg/conffiles
-/etc/opkg/opkg.conf
+/etc/opkg.conf
endef
TARGET_CFLAGS += $(FPIC) $(if $(CONFIG_GCC_VERSION_4_3)$(CONFIG_GCC_VERSION_4_4),-Wno-array-bounds)
@@ -47,6 +47,7 @@ EXTRA_LDFLAGS += $(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
CONFIGURE_ARGS += \
--disable-curl \
--disable-gpg \
+ --with-ipkgetcdir=/etc
define Build/Configure
(cd $(PKG_BUILD_DIR); \
@@ -67,9 +68,8 @@ define Package/opkg/install
$(INSTALL_DIR) $(1)/usr/lib/opkg
$(INSTALL_DIR) $(1)/bin
$(INSTALL_DIR) $(1)/etc
- $(INSTALL_DIR) $(1)/etc/opkg
- $(INSTALL_DATA) ./files/opkg.conf $(1)/etc/opkg/
- $(SED) 's,$$$$S,$(PKGARCH),g' $(1)/etc/opkg/opkg.conf
+ $(INSTALL_DATA) ./files/opkg.conf $(1)/etc/
+ $(SED) 's,$$$$S,$(PKGARCH),g' $(1)/etc/opkg.conf
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/opkg-cl $(1)/bin/opkg
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libopkg.so.* $(1)/usr/lib/
diff --git a/package/opkg/patches/001-fix-double-parsing.patch b/package/opkg/patches/001-fix-double-parsing.patch
new file mode 100644
index 0000000000..a36ffa48ca
--- /dev/null
+++ b/package/opkg/patches/001-fix-double-parsing.patch
@@ -0,0 +1,12 @@
+--- a/libopkg/args.c
++++ b/libopkg/args.c
+@@ -62,7 +62,7 @@
+ if (conf_file_dir == NULL || conf_file_dir[0] == '\0') {
+ conf_file_dir = ARGS_DEFAULT_CONF_FILE_DIR;
+ }
+- sprintf_alloc(&args->conf_file, "%s/%s", conf_file_dir,
++ sprintf_alloc(&args->conf_file, "%s/%s", OPKGETCDIR,
+ ARGS_DEFAULT_CONF_FILE_NAME);
+
+ args->force_defaults = ARGS_DEFAULT_FORCE_DEFAULTS;
+