summaryrefslogtreecommitdiffstats
path: root/package/base-files
diff options
context:
space:
mode:
authorthepeople <thepeople@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-08-16 06:35:14 +0000
committerthepeople <thepeople@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-08-16 06:35:14 +0000
commitd5dc9a90873047ab07107833a950320ae3b2b41f (patch)
tree73d062cf40a8a2e0aaf64721d7f06700eda6eb71 /package/base-files
parent3de484921c3905e05081e5af8826848fe5cf0ca6 (diff)
make opkg the default package manager, disable busybox ipkg from building by default
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12319 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files')
-rw-r--r--package/base-files/Makefile2
-rwxr-xr-xpackage/base-files/files/bin/firstboot2
-rw-r--r--package/base-files/files/etc/ipkg.conf4
3 files changed, 1 insertions, 7 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 231647e98..9f745aa17 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 ad87f7482..c245d517c 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 c6c9dc717..000000000
--- 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