X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/99ba699421c041858df7fcb50379e3b21798ae12..1f10e341951fcff9f4f208261703eb9db6bf0fcf:/include/package-ipkg.mk?ds=sidebyside

diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index 86c802289..597f5f87c 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -23,14 +23,6 @@ ifeq ($(DUMP),)
         ifeq ($(CONFIG_PACKAGE_$(1)),y)
           install: $$(INFO_$(1))
         endif
-
-        ifneq ($(MAKECMDGOALS),prereq)
-          ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install '$$(IPKG_$(1))' '$(PKG_BUILD_DIR)'),$$(IPKG_$(1)))
-            $(PKG_BUILD_DIR)/.built: package-rebuild
-            $$(info Rebuilding $(subst $(TOPDIR)/,,$$(IPKG_$(1))))
-          endif
-        endif
-
       else
         compile: $(1)-disabled
         $(1)-disabled:
@@ -71,9 +63,9 @@ ifeq ($(DUMP),)
     $$(IPKG_$(1)): $(PKG_BUILD_DIR)/.built $$(IDIR_$(1))/CONTROL/control
 	$(call Package/$(1)/install,$$(IDIR_$(1)))
 	mkdir -p $(PACKAGE_DIR)
-	-find $$(IDIR_$(1)) -name CVS   | xargs -r rm -rf
-	-find $$(IDIR_$(1)) -name .svn  | xargs -r rm -rf
-	-find $$(IDIR_$(1)) -name '.#*' | xargs -r rm -f
+	-find $$(IDIR_$(1)) -name CVS   | $(XARGS) rm -rf
+	-find $$(IDIR_$(1)) -name .svn  | $(XARGS) rm -rf
+	-find $$(IDIR_$(1)) -name '.#*' | $(XARGS) rm -f
 	$(RSTRIP) $$(IDIR_$(1))
 	$(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
 	@[ -f $$(IPKG_$(1)) ] || false 
@@ -86,7 +78,7 @@ ifeq ($(DUMP),)
 
     clean: $(1)-clean
 
-    $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH): $(PKG_BUILD_DIR)/.prepared
+    $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH): $(STAMP_PREPARED)
 	-@rm -f $(PKG_BUILD_DIR)/.version-$(1)_* 2>/dev/null
 	@touch $$@