Changeset 12319


Ignore:
Timestamp:
2008-08-16T08:35:14+02:00 (9 years ago)
Author:
thepeople
Message:

make opkg the default package manager, disable busybox ipkg from building by default

Location:
trunk
Files:
1 added
2 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/target.mk

    r12089 r12319  
    1313 
    1414# Default packages - the really basic set 
    15 DEFAULT_PACKAGES:=base-files libgcc uclibc busybox dropbear mtd uci 
     15DEFAULT_PACKAGES:=base-files libgcc uclibc busybox dropbear mtd uci opkg 
    1616# For router targets 
    1717DEFAULT_PACKAGES.router:=dnsmasq iptables ppp ppp-mod-pppoe kmod-ipt-nathelper bridge firewall 
  • trunk/package/base-files/Makefile

    r12017 r12319  
    5454/etc/profile 
    5555/etc/shells 
    56 /etc/ipkg.conf 
    5756/etc/sysctl.conf 
    5857$(call $(TARGET)/conffiles) 
     
    150149        $(if $(CONFIG_BUSYBOX_CONFIG_FEATURE_SHADOWPASSWDS),cp $(1)/etc/passwd $(1)/etc/shadow) 
    151150        $(SED) 's,$$$$R,$(REVISION),g' $(1)/etc/banner 
    152         $(SED) 's,$$$$S,$(BOARD),g' -e 's,$$$$A,$(ARCH),g' $(1)/etc/ipkg.conf 
    153151        mkdir -p $(1)/dev 
    154152        mkdir -p $(1)/etc/crontabs 
  • trunk/package/base-files/files/bin/firstboot

    r7928 r12319  
    2626                ./rom/note) ;; #nothing 
    2727                ./etc/config*|\ 
    28                 ./usr/lib/ipkg/info/*) cp -af $2/$file $file;; 
     28                ./usr/lib/opkg/info/*) cp -af $2/$file $file;; 
    2929                *) ln -sf /rom/${file#./*} $file;; 
    3030                esac 
  • trunk/package/busybox/config/archival/Config.in

    r9785 r12319  
    134134config BUSYBOX_CONFIG_IPKG 
    135135        bool "ipkg" 
    136         default y 
     136        default n 
    137137        select BUSYBOX_CONFIG_MD5SUM 
    138138        select BUSYBOX_CONFIG_WGET 
  • trunk/package/dropbear/Makefile

    r11913 r12319  
    8989        $(INSTALL_DIR) $(1)/etc/init.d 
    9090        $(INSTALL_BIN) ./files/dropbear.init $(1)/etc/init.d/dropbear 
    91         $(INSTALL_DIR) $(1)/usr/lib/ipkg/info 
    92         echo /etc/dropbear/dropbear_rsa_host_key > $(1)/usr/lib/ipkg/info/dropbear.conffiles 
    93         echo /etc/dropbear/dropbear_dss_host_key >> $(1)/usr/lib/ipkg/info/dropbear.conffiles 
     91        $(INSTALL_DIR) $(1)/usr/lib/opkg/info 
     92        echo /etc/dropbear/dropbear_rsa_host_key > $(1)/usr/lib/opkg/info/dropbear.conffiles 
     93        echo /etc/dropbear/dropbear_dss_host_key >> $(1)/usr/lib/opkg/info/dropbear.conffiles 
    9494endef 
    9595 
  • trunk/package/opkg/Makefile

    r12303 r12319  
    3737endef 
    3838 
     39define Package/opkg/conffiles 
     40/etc/opkg.conf 
     41endef 
     42 
    3943TARGET_CFLAGS += $(FPIC) 
    4044EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/lib 
     
    6064 
    6165define Package/opkg/install 
    62         $(INSTALL_BIN) ./files/postinst $(1)/CONTROL/postinst 
     66        $(INSTALL_DIR) $(1)/usr/lib/opkg 
    6367        $(INSTALL_DIR) $(1)/bin 
     68        $(INSTALL_DIR) $(1)/etc 
     69        $(INSTALL_DATA) ./files/opkg.conf $(1)/etc/ 
     70        $(SED) 's,$$$$S,$(BOARD),g' -e 's,$$$$A,$(ARCH),g' $(1)/etc/opkg.conf 
     71        $(SED) 's,$$$$S,$(BOARD),g' $(1)/etc/opkg.conf 
    6472        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/opkg-cl $(1)/bin/opkg 
    6573        $(INSTALL_DIR) $(1)/usr/lib 
  • trunk/scripts/ipkg

    r6066 r12319  
    117117 
    118118        # Global ipkg state directories 
    119         IPKG_DIR_PREFIX=usr/lib/ipkg 
     119        IPKG_DIR_PREFIX=usr/lib/opkg 
    120120        IPKG_LISTS_DIR=$IPKG_OFFLINE_ROOT/$IPKG_DIR_PREFIX/lists 
    121121        IPKG_PENDING_DIR=$IPKG_OFFLINE_ROOT/$IPKG_DIR_PREFIX/pending 
Note: See TracChangeset for help on using the changeset viewer.