From: Carsten Schlote <[email protected]> While testing the ipkg-push stuff again, I found it a bit nagging to remove the previous dist directory from the ipkg-repository over and over again.
So I added an option to force this behaviour by default. Signed-off-by: Carsten Schlote <[email protected]> --- platforms/image_ipkg.in | 12 ++++++++++++ rules/post/image_ipkg.make | 3 +++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/platforms/image_ipkg.in b/platforms/image_ipkg.in index 8d9076c..2752263 100644 --- a/platforms/image_ipkg.in +++ b/platforms/image_ipkg.in @@ -13,6 +13,18 @@ config IMAGE_IPKG_PUSH_TO_REPOSITORY Please note, that the ipkg-repository is currently a local directory on your machine. +config IMAGE_IPKG_FORCED_PUSH + depends on IMAGE_IPKG_IMAGE_FROM_REPOSITORY + bool + prompt "force ipkg-push" + help + Usually the script checks for some previous ipkg-push to + a 'dist' release and requires you to delete a previous + dist directory + + If this option is checked, this is done by default. This + is most useful for development purposes. + config IMAGE_IPKG_INDEX bool "generate ipkg.index" default y diff --git a/rules/post/image_ipkg.make b/rules/post/image_ipkg.make index 4f8d61b..517dd03 100644 --- a/rules/post/image_ipkg.make +++ b/rules/post/image_ipkg.make @@ -14,6 +14,9 @@ SEL_ROOTFS-$(PTXCONF_IMAGE_IPKG_PUSH_TO_REPOSITORY) += $(STATEDIR)/ipkg-push $(STATEDIR)/ipkg-push: $(STATEDIR)/host-ipkg-utils.install.post @$(call targetinfo) $(HOST_ENV) \ +ifdef PTXCONF_IMAGE_IPKG_FORCED_PUSH + rm -rf $(PTXCONF_SETUP_IPKG_REPOSITORY)/$(PTXCONF_PROJECT)/dists/$(PTXCONF_PROJECT)$(PTXCONF_PROJECT_VERSION) +endif $(PTXDIST_TOPDIR)/scripts/ipkg-push \ --ipkgdir $(call remove_quotes,$(PKGDIR)) \ --repodir $(call remove_quotes,$(PTXCONF_SETUP_IPKG_REPOSITORY)) \ -- 1.6.5.6.gb3118 -- ptxdist mailing list [email protected]
