diff options
| -rw-r--r-- | include/target.mk | 2 | ||||
| -rw-r--r-- | package/base-files/Makefile | 2 | ||||
| -rwxr-xr-x | package/base-files/files/bin/firstboot | 2 | ||||
| -rw-r--r-- | package/busybox/config/archival/Config.in | 2 | ||||
| -rw-r--r-- | package/dropbear/Makefile | 6 | ||||
| -rw-r--r-- | package/opkg/Makefile | 10 | ||||
| -rw-r--r-- | package/opkg/files/opkg.conf (renamed from package/base-files/files/etc/ipkg.conf) | 2 | ||||
| -rw-r--r-- | package/opkg/files/postinst | 3 | ||||
| -rwxr-xr-x | scripts/ipkg | 2 |
9 files changed, 17 insertions, 14 deletions
diff --git a/include/target.mk b/include/target.mk index 34d2935fe8..357bb1f30d 100644 --- a/include/target.mk +++ b/include/target.mk @@ -12,7 +12,7 @@ __target_inc=1 DEVICE_TYPE?=router # Default packages - the really basic set -DEFAULT_PACKAGES:=base-files libgcc uclibc busybox dropbear mtd uci +DEFAULT_PACKAGES:=base-files libgcc uclibc busybox dropbear mtd uci opkg # For router targets DEFAULT_PACKAGES.router:=dnsmasq iptables ppp ppp-mod-pppoe kmod-ipt-nathelper bridge firewall diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 231647e98b..9f745aa173 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 ad87f7482e..c245d517c2 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/busybox/config/archival/Config.in b/package/busybox/config/archival/Config.in index 4350076b96..0cfbbcc3da 100644 --- a/package/busybox/config/archival/Config.in +++ b/package/busybox/config/archival/Config.in @@ -133,7 +133,7 @@ config BUSYBOX_CONFIG_GZIP config BUSYBOX_CONFIG_IPKG bool "ipkg" - default y + default n select BUSYBOX_CONFIG_MD5SUM select BUSYBOX_CONFIG_WGET select BUSYBOX_CONFIG_DIFF diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index bbea72fee4..96eb5911d7 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -88,9 +88,9 @@ define Package/dropbear/install $(INSTALL_DATA) ./files/dropbear.config $(1)/etc/config/dropbear $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/dropbear.init $(1)/etc/init.d/dropbear - $(INSTALL_DIR) $(1)/usr/lib/ipkg/info - echo /etc/dropbear/dropbear_rsa_host_key > $(1)/usr/lib/ipkg/info/dropbear.conffiles - echo /etc/dropbear/dropbear_dss_host_key >> $(1)/usr/lib/ipkg/info/dropbear.conffiles + $(INSTALL_DIR) $(1)/usr/lib/opkg/info + echo /etc/dropbear/dropbear_rsa_host_key > $(1)/usr/lib/opkg/info/dropbear.conffiles + echo /etc/dropbear/dropbear_dss_host_key >> $(1)/usr/lib/opkg/info/dropbear.conffiles endef define Package/dropbearconvert/install diff --git a/package/opkg/Makefile b/package/opkg/Makefile index 97971b3af5..67de0bcb6d 100644 --- a/package/opkg/Makefile +++ b/package/opkg/Makefile @@ -36,6 +36,10 @@ define Package/opkg/description opkg knows how to install both .ipk and .deb packages. endef +define Package/opkg/conffiles +/etc/opkg.conf +endef + TARGET_CFLAGS += $(FPIC) EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/lib EXTRA_LDFLAGS+=-L$(STAGING_DIR)/usr/lib -Wl,-rpath-link,$(STAGING_DIR)/usr/lib @@ -59,8 +63,12 @@ define Build/Compile endef define Package/opkg/install - $(INSTALL_BIN) ./files/postinst $(1)/CONTROL/postinst + $(INSTALL_DIR) $(1)/usr/lib/opkg $(INSTALL_DIR) $(1)/bin + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DATA) ./files/opkg.conf $(1)/etc/ + $(SED) 's,$$$$S,$(BOARD),g' -e 's,$$$$A,$(ARCH),g' $(1)/etc/opkg.conf + $(SED) 's,$$$$S,$(BOARD),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/base-files/files/etc/ipkg.conf b/package/opkg/files/opkg.conf index c6c9dc717b..f7f96fe2b6 100644 --- a/package/base-files/files/etc/ipkg.conf +++ b/package/opkg/files/opkg.conf @@ -1,4 +1,4 @@ src snapshots http://downloads.openwrt.org/snapshots/$S/packages dest root / dest ram /tmp -lists_dir ext /var/ipkg-lists +lists_dir ext /var/opkg-lists diff --git a/package/opkg/files/postinst b/package/opkg/files/postinst deleted file mode 100644 index c2bb38187d..0000000000 --- a/package/opkg/files/postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -ln -sf "/usr/lib/ipkg" "${IPKG_INSTROOT}/usr/lib/opkg" -ln -sf "/etc/ipkg.conf" "${IPKG_INSTROOT}/etc/opkg.conf" diff --git a/scripts/ipkg b/scripts/ipkg index 311f3abdb5..9143c984ed 100755 --- a/scripts/ipkg +++ b/scripts/ipkg @@ -116,7 +116,7 @@ Valid destinations are directories or one of the dest names from $IPKG_CONF:" >& fi # Global ipkg state directories - IPKG_DIR_PREFIX=usr/lib/ipkg + IPKG_DIR_PREFIX=usr/lib/opkg IPKG_LISTS_DIR=$IPKG_OFFLINE_ROOT/$IPKG_DIR_PREFIX/lists IPKG_PENDING_DIR=$IPKG_OFFLINE_ROOT/$IPKG_DIR_PREFIX/pending if [ -z "$IPKG_TMP" ]; then |