make opkg the default package manager, disable busybox ipkg from building by default
SVN-Revision: 12319
This commit is contained in:
parent
64a8d6c405
commit
99dd3e13fc
@ -12,7 +12,7 @@ __target_inc=1
|
|||||||
DEVICE_TYPE?=router
|
DEVICE_TYPE?=router
|
||||||
|
|
||||||
# Default packages - the really basic set
|
# 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
|
# For router targets
|
||||||
DEFAULT_PACKAGES.router:=dnsmasq iptables ppp ppp-mod-pppoe kmod-ipt-nathelper bridge firewall
|
DEFAULT_PACKAGES.router:=dnsmasq iptables ppp ppp-mod-pppoe kmod-ipt-nathelper bridge firewall
|
||||||
|
|
||||||
|
@ -53,7 +53,6 @@ define Package/base-files$(TARGET)/conffiles
|
|||||||
/etc/passwd
|
/etc/passwd
|
||||||
/etc/profile
|
/etc/profile
|
||||||
/etc/shells
|
/etc/shells
|
||||||
/etc/ipkg.conf
|
|
||||||
/etc/sysctl.conf
|
/etc/sysctl.conf
|
||||||
$(call $(TARGET)/conffiles)
|
$(call $(TARGET)/conffiles)
|
||||||
endef
|
endef
|
||||||
@ -149,7 +148,6 @@ define Package/base-files$(TARGET)/install
|
|||||||
)
|
)
|
||||||
$(if $(CONFIG_BUSYBOX_CONFIG_FEATURE_SHADOWPASSWDS),cp $(1)/etc/passwd $(1)/etc/shadow)
|
$(if $(CONFIG_BUSYBOX_CONFIG_FEATURE_SHADOWPASSWDS),cp $(1)/etc/passwd $(1)/etc/shadow)
|
||||||
$(SED) 's,$$$$R,$(REVISION),g' $(1)/etc/banner
|
$(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)/dev
|
||||||
mkdir -p $(1)/etc/crontabs
|
mkdir -p $(1)/etc/crontabs
|
||||||
mkdir -p $(1)/jffs
|
mkdir -p $(1)/jffs
|
||||||
|
@ -25,7 +25,7 @@ dupe() { # <new_root> <old_root>
|
|||||||
case "$file" in
|
case "$file" in
|
||||||
./rom/note) ;; #nothing
|
./rom/note) ;; #nothing
|
||||||
./etc/config*|\
|
./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;;
|
*) ln -sf /rom/${file#./*} $file;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
@ -133,7 +133,7 @@ config BUSYBOX_CONFIG_GZIP
|
|||||||
|
|
||||||
config BUSYBOX_CONFIG_IPKG
|
config BUSYBOX_CONFIG_IPKG
|
||||||
bool "ipkg"
|
bool "ipkg"
|
||||||
default y
|
default n
|
||||||
select BUSYBOX_CONFIG_MD5SUM
|
select BUSYBOX_CONFIG_MD5SUM
|
||||||
select BUSYBOX_CONFIG_WGET
|
select BUSYBOX_CONFIG_WGET
|
||||||
select BUSYBOX_CONFIG_DIFF
|
select BUSYBOX_CONFIG_DIFF
|
||||||
|
@ -88,9 +88,9 @@ define Package/dropbear/install
|
|||||||
$(INSTALL_DATA) ./files/dropbear.config $(1)/etc/config/dropbear
|
$(INSTALL_DATA) ./files/dropbear.config $(1)/etc/config/dropbear
|
||||||
$(INSTALL_DIR) $(1)/etc/init.d
|
$(INSTALL_DIR) $(1)/etc/init.d
|
||||||
$(INSTALL_BIN) ./files/dropbear.init $(1)/etc/init.d/dropbear
|
$(INSTALL_BIN) ./files/dropbear.init $(1)/etc/init.d/dropbear
|
||||||
$(INSTALL_DIR) $(1)/usr/lib/ipkg/info
|
$(INSTALL_DIR) $(1)/usr/lib/opkg/info
|
||||||
echo /etc/dropbear/dropbear_rsa_host_key > $(1)/usr/lib/ipkg/info/dropbear.conffiles
|
echo /etc/dropbear/dropbear_rsa_host_key > $(1)/usr/lib/opkg/info/dropbear.conffiles
|
||||||
echo /etc/dropbear/dropbear_dss_host_key >> $(1)/usr/lib/ipkg/info/dropbear.conffiles
|
echo /etc/dropbear/dropbear_dss_host_key >> $(1)/usr/lib/opkg/info/dropbear.conffiles
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/dropbearconvert/install
|
define Package/dropbearconvert/install
|
||||||
|
@ -36,6 +36,10 @@ define Package/opkg/description
|
|||||||
opkg knows how to install both .ipk and .deb packages.
|
opkg knows how to install both .ipk and .deb packages.
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
define Package/opkg/conffiles
|
||||||
|
/etc/opkg.conf
|
||||||
|
endef
|
||||||
|
|
||||||
TARGET_CFLAGS += $(FPIC)
|
TARGET_CFLAGS += $(FPIC)
|
||||||
EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/lib
|
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
|
EXTRA_LDFLAGS+=-L$(STAGING_DIR)/usr/lib -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
|
||||||
@ -59,8 +63,12 @@ define Build/Compile
|
|||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/opkg/install
|
define Package/opkg/install
|
||||||
$(INSTALL_BIN) ./files/postinst $(1)/CONTROL/postinst
|
$(INSTALL_DIR) $(1)/usr/lib/opkg
|
||||||
$(INSTALL_DIR) $(1)/bin
|
$(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_BIN) $(PKG_INSTALL_DIR)/usr/bin/opkg-cl $(1)/bin/opkg
|
||||||
$(INSTALL_DIR) $(1)/usr/lib
|
$(INSTALL_DIR) $(1)/usr/lib
|
||||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libopkg.so.* $(1)/usr/lib/
|
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libopkg.so.* $(1)/usr/lib/
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
src snapshots http://downloads.openwrt.org/snapshots/$S/packages
|
src snapshots http://downloads.openwrt.org/snapshots/$S/packages
|
||||||
dest root /
|
dest root /
|
||||||
dest ram /tmp
|
dest ram /tmp
|
||||||
lists_dir ext /var/ipkg-lists
|
lists_dir ext /var/opkg-lists
|
@ -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"
|
|
@ -116,7 +116,7 @@ Valid destinations are directories or one of the dest names from $IPKG_CONF:" >&
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Global ipkg state directories
|
# 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_LISTS_DIR=$IPKG_OFFLINE_ROOT/$IPKG_DIR_PREFIX/lists
|
||||||
IPKG_PENDING_DIR=$IPKG_OFFLINE_ROOT/$IPKG_DIR_PREFIX/pending
|
IPKG_PENDING_DIR=$IPKG_OFFLINE_ROOT/$IPKG_DIR_PREFIX/pending
|
||||||
if [ -z "$IPKG_TMP" ]; then
|
if [ -z "$IPKG_TMP" ]; then
|
||||||
|
Loading…
Reference in New Issue
Block a user