aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMike Baker <mbm@openwrt.org>2006-07-26 01:01:09 +0000
committerMike Baker <mbm@openwrt.org>2006-07-26 01:01:09 +0000
commit5dae0b1030604ed0d84e6c267c717ef066df2bff (patch)
tree6b763d6b17cac104e9f1dbf03c618468896c245e /include
parentbbe34c995114a9985eab2bef87c8af8cf5a631c6 (diff)
downloadupstream-5dae0b1030604ed0d84e6c267c717ef066df2bff.tar.gz
upstream-5dae0b1030604ed0d84e6c267c717ef066df2bff.tar.bz2
upstream-5dae0b1030604ed0d84e6c267c717ef066df2bff.zip
add more ipkg validation checks
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4292 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
-rw-r--r--include/package.mk15
1 files changed, 9 insertions, 6 deletions
diff --git a/include/package.mk b/include/package.mk
index 757c8396ae..7af7420395 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -12,14 +12,12 @@ endif
define Build/DefaultTargets
ifeq ($(DUMP),)
- ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR))
- ifeq ($(CONFIG_AUTOREBUILD),y)
+ ifeq ($(CONFIG_AUTOREBUILD),y)
+ ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR))
$(PKG_BUILD_DIR)/.prepared: package-clean
endif
- endif
- ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1)))
- ifeq ($(CONFIG_AUTOREBUILD),y)
+ ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1)))
$(PKG_BUILD_DIR)/.built: package-rebuild
endif
endif
@@ -182,7 +180,7 @@ define BuildPackage
$(eval $(call BuildIPKGVariable,$(1),postinst))
$(eval $(call BuildIPKGVariable,$(1),prerm))
$(eval $(call BuildIPKGVariable,$(1),postrm))
- $$(IDIR_$(1))/CONTROL/control: Makefile $(PKG_BUILD_DIR)/.prepared
+ $$(IDIR_$(1))/CONTROL/control: Makefile $(PKG_BUILD_DIR)/.prepared $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH)
mkdir -p $$(IDIR_$(1))/CONTROL
echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control
echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control
@@ -212,6 +210,7 @@ define BuildPackage
-find $$(IDIR_$(1)) -name '.#*' | xargs rm -f
$(RSTRIP) $$(IDIR_$(1))
$(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
+ @[ -f $$(IPKG_$(1)) ] || false
$$(INFO_$(1)): $$(IPKG_$(1))
$(IPKG) install $$(IPKG_$(1))
@@ -221,6 +220,10 @@ define BuildPackage
clean: $(1)-clean
+ $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH):
+ -rm $(PKG_BUILD_DIR)/.version-$(1)_*
+ @touch $$@
+
$$(eval $$(call Build/DefaultTargets,$(1)))
endef