From 99dd3e13fc1c48a75842dbe87ddd1e87a3e213de Mon Sep 17 00:00:00 2001
From: Travis Kemen <thepeople@openwrt.org>
Date: Sat, 16 Aug 2008 06:35:14 +0000
Subject: make opkg the default package manager, disable busybox ipkg from
 building by default

SVN-Revision: 12319
---
 package/base-files/Makefile            | 2 --
 package/base-files/files/bin/firstboot | 2 +-
 package/base-files/files/etc/ipkg.conf | 4 ----
 3 files changed, 1 insertion(+), 7 deletions(-)
 delete mode 100644 package/base-files/files/etc/ipkg.conf

(limited to 'package/base-files')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 231647e..9f745aa 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -53,7 +53,6 @@ define Package/base-files$(TARGET)/conffiles
 /etc/passwd
 /etc/profile
 /etc/shells
-/etc/ipkg.conf
 /etc/sysctl.conf
 $(call $(TARGET)/conffiles)
 endef
@@ -149,7 +148,6 @@ define Package/base-files$(TARGET)/install
 	)
 	$(if $(CONFIG_BUSYBOX_CONFIG_FEATURE_SHADOWPASSWDS),cp $(1)/etc/passwd $(1)/etc/shadow)
 	$(SED) 's,$$$$R,$(REVISION),g' $(1)/etc/banner
-	$(SED) 's,$$$$S,$(BOARD),g' -e 's,$$$$A,$(ARCH),g' $(1)/etc/ipkg.conf
 	mkdir -p $(1)/dev
 	mkdir -p $(1)/etc/crontabs
 	mkdir -p $(1)/jffs
diff --git a/package/base-files/files/bin/firstboot b/package/base-files/files/bin/firstboot
index ad87f74..c245d51 100755
--- a/package/base-files/files/bin/firstboot
+++ b/package/base-files/files/bin/firstboot
@@ -25,7 +25,7 @@ dupe() { # <new_root> <old_root>
 		case "$file" in
 		./rom/note) ;; #nothing
 		./etc/config*|\
-		./usr/lib/ipkg/info/*) cp -af $2/$file $file;;
+		./usr/lib/opkg/info/*) cp -af $2/$file $file;;
 		*) ln -sf /rom/${file#./*} $file;;
 		esac
 	done
diff --git a/package/base-files/files/etc/ipkg.conf b/package/base-files/files/etc/ipkg.conf
deleted file mode 100644
index c6c9dc7..0000000
--- a/package/base-files/files/etc/ipkg.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/ipkg-lists
-- 
cgit v1.1