KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add more ipkg validation checks

Browse source 
SVN-Revision: 4292
This commit is contained in:
Mike Baker 2006-07-26 01:01:09 +00:00
parent 41779d0cbe
commit 43ea2723a8
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
openwrt/include/package.mk
View file

@ -12,14 +12,12 @@ endif
define Build/DefaultTargets define Build/DefaultTargets
ifeq ($(DUMP),) 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 $(PKG_BUILD_DIR)/.prepared: package-clean
endif endif
endif
ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1))) ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1)))
ifeq ($(CONFIG_AUTOREBUILD),y)
$(PKG_BUILD_DIR)/.built: package-rebuild $(PKG_BUILD_DIR)/.built: package-rebuild
endif endif
endif endif
@ -182,7 +180,7 @@ define BuildPackage
$(eval $(call BuildIPKGVariable,$(1),postinst)) $(eval $(call BuildIPKGVariable,$(1),postinst))
$(eval $(call BuildIPKGVariable,$(1),prerm)) $(eval $(call BuildIPKGVariable,$(1),prerm))
$(eval $(call BuildIPKGVariable,$(1),postrm)) $(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 mkdir -p $$(IDIR_$(1))/CONTROL
echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control
echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control
@ -212,6 +210,7 @@ define BuildPackage
-find $$(IDIR_$(1)) -name '.#*' | xargs rm -f -find $$(IDIR_$(1)) -name '.#*' | xargs rm -f
$(RSTRIP) $$(IDIR_$(1)) $(RSTRIP) $$(IDIR_$(1))
$(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR) $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
@[ -f $$(IPKG_$(1)) ] || false
$$(INFO_$(1)): $$(IPKG_$(1)) $$(INFO_$(1)): $$(IPKG_$(1))
$(IPKG) install $$(IPKG_$(1)) $(IPKG) install $$(IPKG_$(1))
@ -221,6 +220,10 @@ define BuildPackage
clean: $(1)-clean clean: $(1)-clean
$(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH):
-rm $(PKG_BUILD_DIR)/.version-$(1)_*
@touch $$@
$$(eval $$(call Build/DefaultTargets,$(1))) $$(eval $$(call Build/DefaultTargets,$(1)))
endef endef