projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
more buildroot-ng bugfixes
[openwrt.git] / package / rules.mk
diff --git a/package/rules.mk b/package/rules.mk
index 18f53bd..d40d692 100644 (file)
--- a/package/rules.mk
+++ b/package/rules.mk
@@ -1,58 +1,173 @@
-# invoke ipkg with configuration in $(STAGING_DIR)/etc/ipkg.conf 
+# default target
+ifneq ($(DUMP),)
+all: dumpinfo
+else
+all: compile
+endif
+
+define Build/DefaultTargets
+$(PKG_BUILD_DIR)/.prepared:
+       rm -rf $(PKG_BUILD_DIR)
+       mkdir -p $(PKG_BUILD_DIR)
+       $(call Build/Prepare)
+       touch $$@
+
+$(PKG_BUILD_DIR)/.configured:
+       $(call Build/Configure)
+       touch $$@
+
+$(PKG_BUILD_DIR)/.built:
+       $(call Build/Compile)
+       touch $$@
+
+define Build/DefaultTargets
+endef
+endef
 
 
-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)),)
+define Package/Default
+CONFIGFILE:=
+SECTION:=opt
+CATEGORY:=Extra packages
+DEPENDS:=
+MAINTAINER:=OpenWrt Developers Team <openwrt-devel@openwrt.org>
+SOURCE:=$(patsubst $(TOPDIR)/%,%,${shell pwd})
+VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
+PKGARCH:=$(ARCH)
+PRIORITY:=optional
+TITLE:=
+DESCRIPTION:=
+endef
+
+define BuildPackage
+$$(eval $$(call Package/Default))
+$$(eval $$(call Package/$(1)))
+
+ifeq ($$(TITLE),)
+$$(error Package $(1) has no TITLE)
+endif
+ifeq ($$(CATEGORY),)
+$$(error Package $(1) has no CATEGORY)
+endif
+ifeq ($$(PRIORITY),)
+$$(error Package $(1) has no PRIORITY)
+endif
+ifeq ($$(VERSION),)
+$$(error Package $(1) has no VERSION)
+endif
+ifeq ($$(PKGARCH),)
+PKGARCH:=$(ARCH)
+endif
+
+IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk
+IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1)
+INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list
+
+ifneq ($(PACKAGE_$(1)),)
 compile-targets: $$(IPKG_$(1))
 endif
 ifneq ($(DEVELOPER),)
 compile-targets: $$(IPKG_$(1))
 endif
 compile-targets: $$(IPKG_$(1))
 endif
 ifneq ($(DEVELOPER),)
 compile-targets: $$(IPKG_$(1))
 endif
-ifeq ($(BR2_PACKAGE_$(1)),y)
+ifeq ($(PACKAGE_$(1)),y)
 install-targets: $$(INFO_$(1))
 endif
 
 install-targets: $$(INFO_$(1))
 endif
 
-IDEPEND_$(1):=$$(strip $(5))
+IDEPEND_$(1):=$$(strip $$(DEPENDS))
+CONTROLINFO_$(1) = \
+       echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control; \
+       echo "Version: $$(VERSION)" >> $$(IDIR_$(1))/CONTROL/control; \
+       echo "Depends: $$(IDEPEND_$(1))" >> $$(IDIR_$(1))/CONTROL/control; \
+       echo "Source: $$(SOURCE)" >> $$(IDIR_$(1))/CONTROL/control; \
+       echo "Section: $$(SECTION)" >> $$(IDIR_$(1))/CONTROL/control; \
+       echo "Priority: $$(PRIORITY)" >> $$(IDIR_$(1))/CONTROL/control; \
+       echo "Maintainer: $$(MAINTAINER)" >> $$(IDIR_$(1))/CONTROL/control; \
+       echo "Architecture: $$(PKGARCH)" >> $$(IDIR_$(1))/CONTROL/control; \
+       echo "Description: $$(TITLE)" >> $$(IDIR_$(1))/CONTROL/control; \
+       echo "$$(DESCRIPTION)" | sed -e 's,\\,\n ,g' >> $$(IDIR_$(1))/CONTROL/control;
 
 $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.prepared
 
 $$(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
+       mkdir -p $$(IDIR_$(1))/CONTROL
+       $$(CONTROLINFO_$(1))
+       chmod 644 $$(IDIR_$(1))/CONTROL/control
        for file in conffiles preinst postinst prerm postrm; do \
        for file in conffiles preinst postinst prerm postrm; do \
-               [ -f ./ipkg/$(2).$$$$file ] && cp ./ipkg/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file || true; \
+               [ -f ./ipkg/$(1).$$$$file ] && cp ./ipkg/$(1).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file || true; \
        done
 
 $$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $(PKG_BUILD_DIR)/.built $(PACKAGE_DIR)
        done
 
 $$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $(PKG_BUILD_DIR)/.built $(PACKAGE_DIR)
+       $(call Package/$(1)/install,$$(IDIR_$(1)))
+       $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
 
 $$(INFO_$(1)): $$(IPKG_$(1))
        $(IPKG) install $$(IPKG_$(1))
 
 
 $$(INFO_$(1)): $$(IPKG_$(1))
        $(IPKG) install $$(IPKG_$(1))
 
-$(2)-clean:
+$(1)-clean:
        rm -f $$(IPKG_$(1))
        rm -f $$(IPKG_$(1))
-clean: $(2)-clean
-endef
+clean: $(1)-clean
+
+DUMPINFO += \
+       echo "Package: $(1)"; \
+       echo "Version: $$(VERSION)"; \
+       echo "Depends: $$(IDEPEND_$(1))"; \
+       echo "Title: $$(TITLE)"; \
+       echo "$$(DESCRIPTION)" | sed -e 's,\\,\n,g'; \
+       echo; \
+       echo "$$(URL)"; \
+       echo "@@";
+
+PACKAGES += $(1)
+
+ifneq ($(__DEFAULT_TARGETS),1)
+$(eval $(call Build/DefaultTargets))
+endif
 
 
+endef
 
 ifneq ($(strip $(PKG_SOURCE)),)
 $(DL_DIR)/$(PKG_SOURCE):
        @$(CMD_TRACE) "downloading... "
        $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL) $(MAKE_TRACE) 
 
 ifneq ($(strip $(PKG_SOURCE)),)
 $(DL_DIR)/$(PKG_SOURCE):
        @$(CMD_TRACE) "downloading... "
        $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL) $(MAKE_TRACE) 
+       
+$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
 endif
 
 ifneq ($(strip $(PKG_CAT)),)
 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) -
+define Build/Prepare/Default
+       if [ "$(PKG_CAT)" = "unzip" ]; then \
+               unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE) ; \
+       else \
+               $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) - ; \
+       fi                                                
        if [ -d ./patches ]; then \
                $(PATCH) $(PKG_BUILD_DIR) ./patches ; \
        fi
        if [ -d ./patches ]; then \
                $(PATCH) $(PKG_BUILD_DIR) ./patches ; \
        fi
-       touch $(PKG_BUILD_DIR)/.prepared
+endef
 endif
 
 endif
 
-all: compile
+define Build/Prepare
+$(call Build/Prepare/Default)
+endef
+
+define Build/Configure/Default
+# TODO: add configurable default command
+endef
+
+define Build/Configure
+$(call Build/Configure/Default)
+endef
+
+define Build/Compile/Default
+# TODO: add configurable default command
+endef
+
+define Build/Compile
+$(call Build/Compile/Default)
+endef
+
+ifneq ($(DUMP),)
+dumpinfo:
+       $(DUMPINFO)
+else
 
 source: $(DL_DIR)/$(PKG_SOURCE)
 prepare: source
 
 source: $(DL_DIR)/$(PKG_SOURCE)
 prepare: source
@@ -86,9 +201,6 @@ rebuild:
        fi
        $(MAKE) compile $(MAKE_TRACE)
 
        fi
        $(MAKE) compile $(MAKE_TRACE)
 
-$(PKG_BUILD_DIR)/.configured:
-$(PKG_BUILD_DIR)/.built:
-
 $(PACKAGE_DIR):
        mkdir -p $@
 
 $(PACKAGE_DIR):
        mkdir -p $@
 
@@ -97,5 +209,6 @@ clean:
        @$(CMD_TRACE) "cleaning... " 
        @$(MAKE) clean-targets $(MAKE_TRACE)
        rm -rf $(PKG_BUILD_DIR)
        @$(CMD_TRACE) "cleaning... " 
        @$(MAKE) clean-targets $(MAKE_TRACE)
        rm -rf $(PKG_BUILD_DIR)
+endif
 
 
-.PHONY: all source prepare compile install clean
+.PHONY: all source prepare compile install clean dumpinfo
Personal OpenWRT clone
This page took 0.027341 seconds and 4 git commands to generate.