aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTravis Kemen <thepeople@openwrt.org>2008-07-29 17:23:52 +0000
committerTravis Kemen <thepeople@openwrt.org>2008-07-29 17:23:52 +0000
commit44ef6c1c3d1ef19671889307b45ad0652bcb22ce (patch)
treefc253a2f741b1e70706cbe98ba17421440ada173
parentd7a52d4599418fabb499098511698adcdd53916e (diff)
downloadupstream-44ef6c1c3d1ef19671889307b45ad0652bcb22ce.tar.gz
upstream-44ef6c1c3d1ef19671889307b45ad0652bcb22ce.tar.bz2
upstream-44ef6c1c3d1ef19671889307b45ad0652bcb22ce.zip
remove opkg config file and link ipkg.conf to opkg.conf being they are the same
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11994 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/opkg/Makefile3
-rw-r--r--package/opkg/files/opkg.conf4
-rw-r--r--package/opkg/files/postinst1
3 files changed, 1 insertions, 7 deletions
diff --git a/package/opkg/Makefile b/package/opkg/Makefile
index 45010c7f3a..e8aebcbb48 100644
--- a/package/opkg/Makefile
+++ b/package/opkg/Makefile
@@ -58,9 +58,6 @@ define Build/Compile
endef
define Package/opkg/install
- $(INSTALL_DIR) $(1)/etc
- $(INSTALL_DATA) ./files/opkg.conf $(1)/etc/
- $(SED) 's,$$$$S,$(BOARD),g' $(1)/etc/opkg.conf
$(INSTALL_BIN) ./files/postinst $(1)/CONTROL/postinst
$(INSTALL_DIR) $(1)/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/opkg-cl $(1)/bin/opkg
diff --git a/package/opkg/files/opkg.conf b/package/opkg/files/opkg.conf
deleted file mode 100644
index f7f96fe2b6..0000000000
--- a/package/opkg/files/opkg.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-src snapshots http://downloads.openwrt.org/snapshots/$S/packages
-dest root /
-dest ram /tmp
-lists_dir ext /var/opkg-lists
diff --git a/package/opkg/files/postinst b/package/opkg/files/postinst
index c479744500..6aa8731ee9 100644
--- a/package/opkg/files/postinst
+++ b/package/opkg/files/postinst
@@ -1,2 +1,3 @@
#!/bin/sh
ln -sf "${IPKG_INSTROOT}/usr/lib/ipkg" "${IPKG_INSTROOT}/usr/lib/opkg"
+ln -sf "${IPKG_INSTROOT}/etc/ipkg.conf" "${IPKG_INSTROOT}/etc/opkg.conf"