make the buildroot-ng sdk compatible with the old packages

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4158 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/include/package.mk b/include/package.mk
index 2784cc888175d20fc0adb102d1fc1669a775fd46..ce07640eeda5d47573a34d4034669a41accbb044 100644 (file)
--- a/include/package.mk
+++ b/include/package.mk
@@ -41,6 +41,7 @@ define Build/DefaultTargets
        touch $$@
 
   $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed: $(PKG_BUILD_DIR)/.built
+       mkdir -p $(STAGING_DIR)/stampfiles
        $(call Build/InstallDev)
        touch $$@
        

diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index 25d2acc57cf71f2f1dd998da49258569babe0493..0552b0aaa81f204cef6dd40e283bf67edd429847 100644 (file)
--- a/target/sdk/Makefile
+++ b/target/sdk/Makefile
@@ -28,8 +28,9 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2:
        $(CP) $(STAGING_DIR) $(INCLUDE_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/
        $(CP) $(TOPDIR)/rules.mk $(TOPDIR)/.config $(SDK_BUILD_DIR)/
        $(CP) $(TOPDIR)/package/Makefile $(SDK_BUILD_DIR)/package/
-       $(CP) ./files/Makefile.sdk $(SDK_BUILD_DIR)/Makefile
+       $(CP) ./files/Makefile $(SDK_BUILD_DIR)/
        $(CP) ./files/README.SDK $(SDK_BUILD_DIR)/
+       $(CP) ./files/package/rules.mk $(SDK_BUILD_DIR)/package/
        echo OPENWRTVERSION:=$(OPENWRTVERSION) > $(SDK_BUILD_DIR)/.version.mk
        find $(SDK_BUILD_DIR) -name .svn | xargs rm -rf 
        find $(SDK_BUILD_DIR) -name CVS | xargs rm -rf 

diff --git a/target/sdk/files/Makefile.sdk b/target/sdk/files/Makefile
similarity index 92%
rename from target/sdk/files/Makefile.sdk
rename to target/sdk/files/Makefile
index 50723232bc1c526f09db34891c05023081464105..ba488e380c9ebfbd1a0b9245af0a543b54e02799 100644 (file)
--- a/target/sdk/files/Makefile.sdk
+++ b/target/sdk/files/Makefile
@@ -27,9 +27,6 @@ RELEASE:=Kamikaze
 TOPDIR=${shell pwd}
 export TOPDIR
 
-include $(TOPDIR)/.version.mk
-export OPENWRTVERSION
-
 DEVELOPER=1
 export DEVELOPER
 
@@ -55,6 +52,12 @@ download: FORCE
 
 world: FORCE
        $(MAKE) package/compile
+       -( \
+               cd package; \
+               find . -maxdepth 2 -name Config.in | \
+                       sed -e 's,/Config.in,,g' | \
+                       xargs -r -n1 make compile -C; \
+       )
 
 clean: FORCE
        rm -rf build_* bin

diff --git a/target/sdk/files/package/depend.mk b/target/sdk/files/package/depend.mk
new file mode 100644 (file)
index 0000000..d7b844d
--- /dev/null
+++ b/target/sdk/files/package/depend.mk
@@ -0,0 +1,6 @@
+# You can put your package dependencies in here
+# Example (make openvpn depend on openssl):
+#      openvpn-compile: openssl-compile
+#
+# Note: This file is not present in the full buildroot. There you
+# have to put your package dependencies in buildroot/package/Makefile

diff --git a/target/sdk/files/package/rules.mk b/target/sdk/files/package/rules.mk
new file mode 100644 (file)
index 0000000..b3f4cdb
--- /dev/null
+++ b/target/sdk/files/package/rules.mk
@@ -0,0 +1,89 @@
+# invoke ipkg with configuration in $(STAGING_DIR)/etc/ipkg.conf 
+IPKG := IPKG_INSTROOT=$(TARGET_DIR) IPKG_CONF_DIR=$(IPKG_CONF) $(SCRIPT_DIR)/ipkg -force-defaults -force-depends
+IPKG_STATE_DIR := $(TARGET_DIR)/usr/lib/ipkg
+
+ifneq ($(DUMP),)
+dump:
+.PHONY: dump
+endif
+
+define PKG_template
+IPKG_$(1):=$(PACKAGE_DIR)/$(2)_$(3)_$(4).ipk
+IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(2)
+INFO_$(1):=$(IPKG_STATE_DIR)/info/$(2).list
+
+ifneq ($(BR2_PACKAGE_$(1)),)
+compile-targets: $$(IPKG_$(1))
+endif
+ifneq ($(DEVELOPER),)
+compile-targets: $$(IPKG_$(1))
+endif
+ifeq ($(BR2_PACKAGE_$(1)),y)
+install-targets: $$(INFO_$(1))
+endif
+
+IDEPEND_$(1):=$$(strip $(5))
+
+$$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.prepared
+       $(SCRIPT_DIR)/make-ipkg-dir.sh $$(IDIR_$(1)) ./ipkg/$(2).control $(3) $(4)
+       if [ "$$(IDEPEND_$(1))" != "" ]; then echo "Depends: $$(IDEPEND_$(1))" >> $$(IDIR_$(1))/CONTROL/control; fi
+       for file in conffiles preinst postinst prerm postrm; do \
+               [ -f ./ipkg/$(2).$$$$file ] && cp ./ipkg/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file || true; \
+       done
+
+$$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $(PKG_BUILD_DIR)/.built $(PACKAGE_DIR)
+
+$$(INFO_$(1)): $$(IPKG_$(1))
+       $(IPKG) install $$(IPKG_$(1))
+
+$(2)-clean:
+       rm -f $$(IPKG_$(1))
+clean-targets: $(2)-clean
+endef
+
+ifeq ($(DUMP),)
+ifneq ($(strip $(PKG_SOURCE)),)
+$(DL_DIR)/$(PKG_SOURCE):
+       $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL)
+endif
+
+ifneq ($(strip $(PKG_CAT)),)
+$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
+       rm -rf $(PKG_BUILD_DIR)
+       mkdir -p $(PKG_BUILD_DIR)
+       $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) -
+       if [ -d ./patches ]; then \
+               $(PATCH) $(PKG_BUILD_DIR) ./patches ; \
+       fi
+       touch $(PKG_BUILD_DIR)/.prepared
+endif
+
+all: compile
+
+compile-targets:
+install-targets:
+clean-targets:
+
+source: $(DL_DIR)/$(PKG_SOURCE)
+prepare: $(PKG_BUILD_DIR)/.prepared
+compile: compile-targets
+install: install-targets
+mostlyclean:
+rebuild:
+       -$(MAKE) mostlyclean
+       if [ -f $(PKG_BUILD_DIR)/.built ]; then \
+               $(MAKE) clean; \
+       fi
+       $(MAKE) compile
+
+$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+
+$(PACKAGE_DIR):
+       mkdir -p $@
+
+clean: clean-targets
+       rm -rf $(PKG_BUILD_DIR)
+
+.PHONY: all source prepare compile install clean
+endif