diff options
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/image-toolchain-tgz.make | 12 | ||||
| -rw-r--r-- | rules/post/cleanup.make | 21 |
2 files changed, 5 insertions, 28 deletions
diff --git a/rules/image-toolchain-tgz.make b/rules/image-toolchain-tgz.make index dfd821c..c7321b0 100644 --- a/rules/image-toolchain-tgz.make +++ b/rules/image-toolchain-tgz.make @@ -17,20 +17,18 @@ IMAGE_PACKAGES-$(PTXCONF_IMAGE_TOOLCHAIN_TGZ) += image-toolchain-tgz # Paths and names # IMAGE_TOOLCHAIN_TGZ_VERSION := $(shell ./scripts/setlocalversion ./.tarball-version) +IMAGE_TOOLCHAIN_TGZ := image-toolchain-tgz-$(IMAGE_TOOLCHAIN_TGZ_VERSION) +IMAGE_TOOLCHAIN_TGZ_DIR := $(BUILDDIR)/$(IMAGE_TOOLCHAIN_TGZ) IMAGE_TOOLCHAIN_TGZ_IMAGE := $(PTXDIST_WORKSPACE)/dist/oselas.toolchain-$(IMAGE_TOOLCHAIN_TGZ_VERSION)-$(subst _,-,$(PTXCONF_PLATFORM))_$(PTX_TOOLCHAIN_HOST_ARCH).tar.xz # ---------------------------------------------------------------------------- # Image # ---------------------------------------------------------------------------- -$(IMAGE_TOOLCHAIN_TGZ_IMAGE): $(STATEDIR)/world.cleanup +$(IMAGE_TOOLCHAIN_TGZ_IMAGE): $(STATEDIR)/world.targetinstall @$(call targetinfo) - @mkdir -p $(dir $@) - @echo 'tar -C "$(PTX_AUTOBUILD_DESTDIR)$(PTXCONF_PREFIX)" \ - --exclude=gcc-first \ - -cJf "$(@)" \ - "${PTXCONF_PROJECT}/$(PTXCONF_GNU_TARGET)/$(PTXCONF_PREFIX_TCID)"' \ - | fakeroot + @$(call world/image/env, IMAGE_TOOLCHAIN_TGZ) \ + ptxd_make_image_tgz @$(call finish) # vim: syntax=make diff --git a/rules/post/cleanup.make b/rules/post/cleanup.make deleted file mode 100644 index 6978311..0000000 --- a/rules/post/cleanup.make +++ /dev/null @@ -1,21 +0,0 @@ - -TOOLCHAIN_CLEANUP_HOST_DIRS := \ - "$(PTXCONF_SYSROOT_CROSS)/lib" \ - "$(PTXCONF_SYSROOT_CROSS)/libexec" \ - "$(PTXCONF_SYSROOT_CROSS)/bin" \ - "$(PTXCONF_SYSROOT_CROSS)/$(call remove_quotes,$(PTXCONF_GNU_TARGET))/bin" - -$(STATEDIR)/world.cleanup: $(STATEDIR)/world.targetinstall - @$(call targetinfo) -ifndef PTXDIST_TOOLCHCAIN_KEEP_DEBUG -# # strip all host binaries - find $(TOOLCHAIN_CLEANUP_HOST_DIRS) \ - -wholename "$(PTXCONF_SYSROOT_CROSS)/lib/gcc" -prune -o \ - -type f \( -executable -o -name "*.so*" \) -print0 \ - | xargs -0 -n1 --verbose strip --preserve-dates || true -endif - @$(call touch) - -world: $(STATEDIR)/world.cleanup - -# vim: syntax=make |