[kirkwood] Align jffs2 to pagesize and fix mkfs2.jffs2 opts

[openwrt.git] / include / package-ipkg.mk

diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index 57b06c8..34e4091 100644 (file)
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -1,20 +1,17 @@
 # 
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006,2007 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
 # where to build (and put) .ipk packages
-OPKG:= \
+IPKG:= \
   IPKG_TMP=$(TMP_DIR)/ipkg \
   IPKG_INSTROOT=$(TARGET_DIR) \
   IPKG_CONF_DIR=$(STAGING_DIR)/etc \
   IPKG_OFFLINE_ROOT=$(TARGET_DIR) \
-  $(STAGING_DIR_HOST)/bin/opkg \
-       -f $(STAGING_DIR)/etc/opkg.conf \
-       --force-depends \
-       --force-overwrite
+  $(SCRIPT_DIR)/ipkg -force-defaults -force-depends
 
 # invoke ipkg-build with some default options
 IPKG_BUILD:= \
@@ -24,7 +21,7 @@ IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/opkg
 
 define BuildIPKGVariable
   $(call shexport,Package/$(1)/$(2))
-  $(1)_COMMANDS += var2file "$(call shvar,Package/$(1)/$(2))" $(2);
+  $(1)_COMMANDS += $(SH_FUNC) var2file "$(call shvar,Package/$(1)/$(2))" $(2);
 endef
 
 PARENL :=(
@@ -79,13 +76,16 @@ ifeq ($(DUMP),)
        rm -rf $(STAGING_DIR_ROOT)/tmp-$(1)
        touch $$@
 
-    $$(IPKG_$(1)): $(STAGING_DIR)/etc/opkg.conf $(STAMP_BUILT)
-       @rm -f $(PACKAGE_DIR)/$(1)_*
-       rm -rf $$(IDIR_$(1))
-       mkdir -p $$(IDIR_$(1))/CONTROL
-       echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control
-       echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control
+    $$(IPKG_$(1)): $(STAGING_DIR)/etc/ipkg.conf $(STAMP_BUILT)
+       @rm -rf $(PACKAGE_DIR)/$(1)_* $$(IDIR_$(1))
+       mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/CONTROL
+       $(call Package/$(1)/install,$$(IDIR_$(1)))
+       -find $$(IDIR_$(1)) -name 'CVS' -o -name '.svn' -o -name '.#*' | $(XARGS) rm -rf
+       $(RSTRIP) $$(IDIR_$(1))
+       SIZE=`cd $$(IDIR_$(1)); du -bs --exclude=./CONTROL . 2>/dev/null | cut -f1`; \
        ( \
+               echo "Package: $(1)"; \
+               echo "Version: $(VERSION)"; \
                DEPENDS='$(EXTRA_DEPENDS)'; \
                for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \
                        DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \
@@ -97,25 +97,18 @@ ifeq ($(DUMP),)
                echo "Priority: $(PRIORITY)"; \
                echo "Maintainer: $(MAINTAINER)"; \
                echo "Architecture: $(PKGARCH)"; \
-               echo "Installed-Size: 1"; \
-               echo -n "Description: "; getvar $(call shvar,Package/$(1)/description) | sed -e 's,^[[:space:]]*, ,g'; \
-       ) >> $$(IDIR_$(1))/CONTROL/control
+               echo "Installed-Size: $$$$SIZE"; \
+               echo -n "Description: "; $(SH_FUNC) getvar $(call shvar,Package/$(1)/description) | sed -e 's,^[[:space:]]*, ,g'; \
+       ) > $$(IDIR_$(1))/CONTROL/control
        chmod 644 $$(IDIR_$(1))/CONTROL/control
        (cd $$(IDIR_$(1))/CONTROL; \
                $($(1)_COMMANDS) \
        )
-       $(call Package/$(1)/install,$$(IDIR_$(1)))
-       mkdir -p $(PACKAGE_DIR)
-       -find $$(IDIR_$(1)) -name 'CVS' -o -name '.svn' -o -name '.#*' | $(XARGS) rm -rf
-       $(RSTRIP) $$(IDIR_$(1))
-       SIZE=`cd $$(IDIR_$(1)); du -bs --exclude=./CONTROL . 2>/dev/null | cut -f1`; \
-       $(SED) "s|^\(Installed-Size:\).*|\1 $$$$SIZE|g" $$(IDIR_$(1))/CONTROL/control
        $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
-       @[ -f $$(IPKG_$(1)) ] || false 
+       @[ -f $$(IPKG_$(1)) ]
 
     $$(INFO_$(1)): $$(IPKG_$(1))
-       @[ -d $(TARGET_DIR)/tmp ] || mkdir -p $(TARGET_DIR)/tmp
-       $(OPKG) install $$(IPKG_$(1))
+       $(IPKG) install $$(IPKG_$(1))
 
     $(1)-clean:
        rm -f $(PACKAGE_DIR)/$(1)_*
@@ -124,11 +117,9 @@ ifeq ($(DUMP),)
 
   endef
 
-  $(STAGING_DIR)/etc/opkg.conf:
+  $(STAGING_DIR)/etc/ipkg.conf:
        mkdir -p $(STAGING_DIR)/etc
-       ( echo "dest root /"                        > $@; \
-         echo "arch all 100"                      >> $@; \
-         echo "arch $(PKGARCH) 200"               >> $@; \
-         echo "option offline_root $(TARGET_DIR)" >> $@ )
+       echo "dest root /" > $(STAGING_DIR)/etc/ipkg.conf
+       echo "option offline_root $(TARGET_DIR)" >> $(STAGING_DIR)/etc/ipkg.conf
 
 endif