Move the image_postproc hook to the 'install-image'

target, since (amusingly) the image is actually
built there and not in the 'build' target as one
might naively expect.

svn path=/dists/trunk/linux-2.6/; revision=5724
This commit is contained in:
Jurij Smakov 2006-02-07 07:04:05 +00:00
parent 973ce22302
commit ab2517fe99
1 changed files with 3 additions and 3 deletions

6
debian/rules.real vendored
View File

@ -128,9 +128,6 @@ $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DIR=$(BUILD_DIR)/build-$(ARCH
$(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
ln -fs "$$(command -v touch)" debian/build/touch.orig
cd '$(DIR)'; $(setup_env) PATH='$(CURDIR)/build:$(CURDIR)/bin:$(PATH)' $(kpkg_image) build
ifdef IMAGE_POSTPROC
cd '$(DIR)'; $(IMAGE_POSTPROC)
endif
touch '$@'
$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR): SOURCE_DIR=$(BUILD_DIR)/source-$(ARCH)-$(SUBARCH)
@ -187,6 +184,9 @@ install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(STAMPS_DIR)/build-$(ARCH)-$(SUBAR
install debian/bin/install-image '$(DIR)/debian/post-install'
cd '$(DIR)'; $(setup_env) $(kpkg_image) kernel-image
cat '$(DIR)/debian/files' >> debian/files
ifdef IMAGE_POSTPROC
cd '$(DIR)'; $(IMAGE_POSTPROC)
endif
@for i in $$(awk '{ print $$1; }' '$(DIR)/debian/files'); do \
echo "mv \"$(BUILD_DIR)/$$i\" .."; \
mv "$(BUILD_DIR)/$$i" ..; \