Author: nbd Date: 2015-03-31 17:13:27 +0200 (Tue, 31 Mar 2015) New Revision: 45187
Modified: trunk/include/package-ipkg.mk Log: build: ensure that preinst and postrm are executable (fixes #19372) Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/include/package-ipkg.mk =================================================================== --- trunk/include/package-ipkg.mk 2015-03-31 13:23:46 UTC (rev 45186) +++ trunk/include/package-ipkg.mk 2015-03-31 15:13:27 UTC (rev 45187) @@ -16,11 +16,12 @@ # 1: package name # 2: variable name # 3: variable suffix +# 4: file is a script define BuildIPKGVariable ifdef Package/$(1)/$(2) $$(IPKG_$(1)) : VAR_$(2)$(3)=$$(Package/$(1)/$(2)) $(call shexport,Package/$(1)/$(2)) - $(1)_COMMANDS += echo "$$$$$$$$$(call shvar,Package/$(1)/$(2))" > $(2)$(3); + $(1)_COMMANDS += echo "$$$$$$$$$(call shvar,Package/$(1)/$(2))" > $(2)$(3); $(if $(4),chmod 0755 $(2)$(3)) endif endef @@ -125,10 +126,10 @@ $(FixupReverseDependencies) $(eval $(call BuildIPKGVariable,$(1),conffiles)) - $(eval $(call BuildIPKGVariable,$(1),preinst)) - $(eval $(call BuildIPKGVariable,$(1),postinst,-pkg)) - $(eval $(call BuildIPKGVariable,$(1),prerm,-pkg)) - $(eval $(call BuildIPKGVariable,$(1),postrm)) + $(eval $(call BuildIPKGVariable,$(1),preinst,,1)) + $(eval $(call BuildIPKGVariable,$(1),postinst,-pkg,1)) + $(eval $(call BuildIPKGVariable,$(1),prerm,-pkg,1)) + $(eval $(call BuildIPKGVariable,$(1),postrm,1)) $(STAGING_DIR_ROOT)/stamp/.$(1)_installed: $(STAMP_BUILT) rm -rf $(STAGING_DIR_ROOT)/tmp-$(1) _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
