[kernel] r9230 - dists/trunk/linux-2.6/debian

Bastian Blank waldi at alioth.debian.org
Mon Jul 30 14:17:42 UTC 2007


Author: waldi
Date: Mon Jul 30 14:17:42 2007
New Revision: 9230

Log:
debian/rules.real: Use _ as delemiter.


Modified:
   dists/trunk/linux-2.6/debian/rules.real

Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	(original)
+++ dists/trunk/linux-2.6/debian/rules.real	Mon Jul 30 14:17:42 2007
@@ -46,12 +46,12 @@
 #
 # Targets
 #
-binary-arch-arch: install-headers-$(ARCH)
+binary-arch-arch: install-headers_$(ARCH)
 binary-arch-arch: install-libc-dev_$(ARCH)
-binary-arch-featureset: install-headers-$(ARCH)-$(FEATURESET)
-binary-arch-flavour: install-image-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-$(TYPE)
+binary-arch-featureset: install-headers_$(ARCH)_$(FEATURESET)
+binary-arch-flavour: install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
 ifeq ($(MODULES),True)
-  binary-arch-flavour: install-headers-$(ARCH)-$(FEATURESET)-$(FLAVOUR)
+  binary-arch-flavour: install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
 endif
 
 binary-indep: install-doc
@@ -61,14 +61,14 @@
 binary-indep: install-support
 binary-indep: install-tree
 
-build: $(STAMPS_DIR)/build-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-$(TYPE)
+build: $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
 
-setup-flavour: $(STAMPS_DIR)/setup-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-$(TYPE)
+setup-flavour: $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
 
 source-arch: $(STAMPS_DIR)/source
-source-featureset: $(STAMPS_DIR)/source-$(ARCH)-$(FEATURESET)
+source-featureset: $(STAMPS_DIR)/source_$(ARCH)_$(FEATURESET)
 
-$(BUILD_DIR)/config.$(ARCH)-$(FEATURESET)-$(FLAVOUR): $(foreach t,$(KCONFIG),debian/config/$(t))
+$(BUILD_DIR)/config.$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(foreach t,$(KCONFIG),debian/config/$(t))
 	python2.4 debian/bin/kconfig.py '$@' $(KCONFIG)
 
 $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2: SOURCE_DIR=$(BUILD_DIR)/source
@@ -93,18 +93,18 @@
 	$(patch_cmd)
 	touch '$@'
 
-$(STAMPS_DIR)/source-$(ARCH)-$(FEATURESET): SOURCE_DIR=$(BUILD_DIR)/source
-$(STAMPS_DIR)/source-$(ARCH)-$(FEATURESET): DIR=$(BUILD_DIR)/source-$(ARCH)-$(FEATURESET)
-$(STAMPS_DIR)/source-$(ARCH)-$(FEATURESET): $(STAMPS_DIR)/source
+$(STAMPS_DIR)/source_$(ARCH)_$(FEATURESET): SOURCE_DIR=$(BUILD_DIR)/source
+$(STAMPS_DIR)/source_$(ARCH)_$(FEATURESET): DIR=$(BUILD_DIR)/source_$(ARCH)_$(FEATURESET)
+$(STAMPS_DIR)/source_$(ARCH)_$(FEATURESET): $(STAMPS_DIR)/source
 	rm -rf '$(DIR)'
 	cp -al '$(SOURCE_DIR)' '$(DIR)'
 	$(patch_cmd) -a $(ARCH) -s $(FEATURESET)
 	touch '$@'
 
-setup-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-all: CONFIG=$(BUILD_DIR)/config.$(ARCH)-$(FEATURESET)-$(FLAVOUR)
-setup-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-all: SOURCE_DIR=$(BUILD_DIR)/source-$(ARCH)-$(FEATURESET)
-setup-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-all: DIR=$(BUILD_DIR)/build-$(ARCH)-$(FEATURESET)-$(FLAVOUR)
-setup-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-all: $(BUILD_DIR)/config.$(ARCH)-$(FEATURESET)-$(FLAVOUR)
+setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_all: CONFIG=$(BUILD_DIR)/config.$(ARCH)_$(FEATURESET)_$(FLAVOUR)
+setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_all: SOURCE_DIR=$(BUILD_DIR)/source_$(ARCH)_$(FEATURESET)
+setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_all: DIR=$(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
+setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_all: $(BUILD_DIR)/config.$(ARCH)_$(FEATURESET)_$(FLAVOUR)
 	rm -rf '$(DIR)'
 	cp -al '$(SOURCE_DIR)' '$(DIR)'
 	cp '$(CONFIG)' '$(DIR)/.config'
@@ -123,35 +123,35 @@
 	echo 'CFLAGS += $(CFLAGS)'  >> '$(DIR)/.kernelvariables'
 	cd '$(DIR)'; $(setup_env) make reportoldconfig
 
-$(STAMPS_DIR)/setup-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-$(TYPE): DIR=$(BUILD_DIR)/build-$(ARCH)-$(FEATURESET)-$(FLAVOUR)
-$(STAMPS_DIR)/setup-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-$(TYPE): $(STAMPS_DIR)/source-$(ARCH)-$(FEATURESET)
+$(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): DIR=$(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
+$(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): $(STAMPS_DIR)/source_$(ARCH)_$(FEATURESET)
 
-$(STAMPS_DIR)/setup-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-kernel-package:
-	$(MAKE) -f debian/rules.real setup-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-all
+$(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_kernel-package:
+	$(MAKE) -f debian/rules.real setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_all
 	mkdir -p '$(DIR)/debian'
 	cp debian/{changelog,control,copyright} '$(DIR)/debian'
 	touch '$(DIR)/debian/official'
 	cd '$(DIR)'; $(setup_env) $(kpkg_image) configure
 	touch '$@'
 
-$(STAMPS_DIR)/setup-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-plain \
-$(STAMPS_DIR)/setup-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-plain-s390-tape \
-$(STAMPS_DIR)/setup-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-plain-xen:
-	$(MAKE) -f debian/rules.real setup-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-all
+$(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain \
+$(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-s390-tape \
+$(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-xen:
+	$(MAKE) -f debian/rules.real setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_all
 	cd '$(DIR)'; $(setup_env) make prepare $(JOBS_ARG)
 	touch '$@'
 
-$(STAMPS_DIR)/build-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-$(TYPE): DIR=$(BUILD_DIR)/build-$(ARCH)-$(FEATURESET)-$(FLAVOUR)
-$(STAMPS_DIR)/build-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-$(TYPE): $(STAMPS_DIR)/setup-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-$(TYPE)
+$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): DIR=$(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
+$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
 
-$(STAMPS_DIR)/build-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-kernel-package:
+$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_kernel-package:
 	cd '$(DIR)'; $(setup_env) $(setup_env_kpkg_jobs) $(kpkg_image) build
 	python2.4 debian/bin/abicheck.py $(DIR) $(ARCH) $(FEATURESET) $(FLAVOUR)
 	touch '$@'
 
-$(STAMPS_DIR)/build-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-plain \
-$(STAMPS_DIR)/build-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-plain-s390-tape \
-$(STAMPS_DIR)/build-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-plain-xen:
+$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain \
+$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-s390-tape \
+$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-xen:
 	cd '$(DIR)'; $(setup_env) make $(JOBS_ARG)
 	python2.4 debian/bin/abicheck.py $(DIR) $(ARCH) $(FEATURESET) $(FLAVOUR)
 	touch '$@'
@@ -217,19 +217,19 @@
 	dh_clean -d -k
 	$(MAKE) -f debian/rules.real install-base
 
-install-headers-$(ARCH): PACKAGE_NAMES = linux-headers-$(UPSTREAMVERSION)$(ABINAME)-all linux-headers-$(UPSTREAMVERSION)$(ABINAME)-all-$(ARCH)
-install-headers-$(ARCH): DH_OPTIONS = $(foreach p, $(PACKAGE_NAMES), -p$(p))
-install-headers-$(ARCH):
+install-headers_$(ARCH): PACKAGE_NAMES = linux-headers-$(UPSTREAMVERSION)$(ABINAME)-all linux-headers-$(UPSTREAMVERSION)$(ABINAME)-all_$(ARCH)
+install-headers_$(ARCH): DH_OPTIONS = $(foreach p, $(PACKAGE_NAMES), -p$(p))
+install-headers_$(ARCH):
 	dh_testdir
 	dh_testroot
 	$(MAKE) -f debian/rules.real install-base GENCONTROL_ARGS='-Vkernel:Arch=$(ARCH)'
 
-install-headers-$(ARCH)-$(FEATURESET): PACKAGE_NAME = linux-headers-$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION_HEADERS)
-install-headers-$(ARCH)-$(FEATURESET): DH_OPTIONS = -p$(PACKAGE_NAME)
-install-headers-$(ARCH)-$(FEATURESET): BASE_DIR = /usr/src/$(PACKAGE_NAME)
-install-headers-$(ARCH)-$(FEATURESET): SOURCE_DIR = $(BUILD_DIR)/source-$(ARCH)-$(FEATURESET)
-install-headers-$(ARCH)-$(FEATURESET): DIR = $(CURDIR)/debian/$(PACKAGE_NAME)/$(BASE_DIR)
-install-headers-$(ARCH)-$(FEATURESET): $(STAMPS_DIR)/source-$(ARCH)-$(FEATURESET)
+install-headers_$(ARCH)_$(FEATURESET): PACKAGE_NAME = linux-headers-$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION_HEADERS)
+install-headers_$(ARCH)_$(FEATURESET): DH_OPTIONS = -p$(PACKAGE_NAME)
+install-headers_$(ARCH)_$(FEATURESET): BASE_DIR = /usr/src/$(PACKAGE_NAME)
+install-headers_$(ARCH)_$(FEATURESET): SOURCE_DIR = $(BUILD_DIR)/source_$(ARCH)_$(FEATURESET)
+install-headers_$(ARCH)_$(FEATURESET): DIR = $(CURDIR)/debian/$(PACKAGE_NAME)/$(BASE_DIR)
+install-headers_$(ARCH)_$(FEATURESET): $(STAMPS_DIR)/source_$(ARCH)_$(FEATURESET)
 	dh_testdir
 	dh_testroot
 	dh_clean -k -d
@@ -253,17 +253,17 @@
 	cpio -pd --preserve-modification-time $(DIR)
 	$(MAKE) -f debian/rules.real install-base
 
-install-headers-$(ARCH)-$(FEATURESET)-$(FLAVOUR): REAL_VERSION = $(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)
-install-headers-$(ARCH)-$(FEATURESET)-$(FLAVOUR): PACKAGE_NAME = linux-headers-$(REAL_VERSION)
-install-headers-$(ARCH)-$(FEATURESET)-$(FLAVOUR): PACKAGE_NAME_HEADERS = linux-headers-$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION_HEADERS)
-install-headers-$(ARCH)-$(FEATURESET)-$(FLAVOUR): PACKAGE_NAME_KBUILD = linux-kbuild-$(VERSION)
-install-headers-$(ARCH)-$(FEATURESET)-$(FLAVOUR): DH_OPTIONS = -p$(PACKAGE_NAME)
-install-headers-$(ARCH)-$(FEATURESET)-$(FLAVOUR): BASE_DIR = /usr/src/$(PACKAGE_NAME)
-install-headers-$(ARCH)-$(FEATURESET)-$(FLAVOUR): SOURCE_DIR = $(BUILD_DIR)/build-$(ARCH)-$(FEATURESET)-$(FLAVOUR)
-install-headers-$(ARCH)-$(FEATURESET)-$(FLAVOUR): REF_DIR = $(BUILD_DIR)/source-$(ARCH)-$(FEATURESET)
-install-headers-$(ARCH)-$(FEATURESET)-$(FLAVOUR): PACKAGE_DIR = $(CURDIR)/debian/$(PACKAGE_NAME)
-install-headers-$(ARCH)-$(FEATURESET)-$(FLAVOUR): DIR = $(PACKAGE_DIR)/$(BASE_DIR)
-install-headers-$(ARCH)-$(FEATURESET)-$(FLAVOUR): $(STAMPS_DIR)/build-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-$(TYPE)
+install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): REAL_VERSION = $(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)
+install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_NAME = linux-headers-$(REAL_VERSION)
+install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_NAME_HEADERS = linux-headers-$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION_HEADERS)
+install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_NAME_KBUILD = linux-kbuild-$(VERSION)
+install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): DH_OPTIONS = -p$(PACKAGE_NAME)
+install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): BASE_DIR = /usr/src/$(PACKAGE_NAME)
+install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): SOURCE_DIR = $(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
+install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): REF_DIR = $(BUILD_DIR)/source_$(ARCH)_$(FEATURESET)
+install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_DIR = $(CURDIR)/debian/$(PACKAGE_NAME)
+install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): DIR = $(PACKAGE_DIR)/$(BASE_DIR)
+install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
 	dh_testdir
 	dh_testroot
 	dh_clean -k -d
@@ -363,15 +363,15 @@
 	echo -e "[version]\nsource: $(SOURCEVERSION)\nabiname: $(ABINAME)" > $(PACKAGE_DIR)/usr/src/$(PACKAGE_NAME)/version
 	$(MAKE) -f debian/rules.real install-base
 
-install-image-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-$(TYPE): REAL_VERSION = $(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)
-install-image-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-$(TYPE): PACKAGE_NAME = linux-image-$(REAL_VERSION)
-install-image-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-$(TYPE): PACKAGE_DIR = $(CURDIR)/debian/$(PACKAGE_NAME)
-install-image-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-$(TYPE): INSTALL_DIR = $(PACKAGE_DIR)/boot
-install-image-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-$(TYPE): DIR = $(BUILD_DIR)/build-$(ARCH)-$(FEATURESET)-$(FLAVOUR)
-install-image-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-$(TYPE): DH_OPTIONS = -p$(PACKAGE_NAME)
-install-image-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-$(TYPE): $(STAMPS_DIR)/build-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-$(TYPE)
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): REAL_VERSION = $(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): PACKAGE_NAME = linux-image-$(REAL_VERSION)
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): PACKAGE_DIR = $(CURDIR)/debian/$(PACKAGE_NAME)
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): INSTALL_DIR = $(PACKAGE_DIR)/boot
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): DIR = $(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): DH_OPTIONS = -p$(PACKAGE_NAME)
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
 
-install-image-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-kernel-package:
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_kernel-package:
 ifdef IMAGE_POSTPROC
 #	Install the postproc script into the hook directory
 	install -d '$(DIR)/debian/image.d'
@@ -384,13 +384,13 @@
 	  mv "$(BUILD_DIR)/$$i" ..;					\
 	done
 
-install-image-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-plain:
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain:
 	dh_testdir
 	dh_testroot
 	dh_clean -d -k
 	dh_installdirs 'boot'
 	$(MAKE) -f debian/rules.real \
-	  install-image-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-plain_image \
+	  install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_image \
 	  DIR='$(DIR)' PACKAGE_DIR='$(PACKAGE_DIR)' INSTALL_DIR='$(INSTALL_DIR)' REAL_VERSION='$(REAL_VERSION)'
 ifeq ($(MODULES),True)
 	cd $(DIR); $(setup_env) make modules_install INSTALL_MOD_PATH=$(PACKAGE_DIR)
@@ -399,21 +399,21 @@
 	rm $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/{build,source,modules.*}
 endif
 	$(MAKE) -f debian/rules.real \
-	  install-image-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-plain_templates \
+	  install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_templates \
 	  PACKAGE_DIR='$(PACKAGE_DIR)' REAL_VERSION='$(REAL_VERSION)'
 	$(MAKE) -f debian/rules.real \
-	  install-image-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-plain_bug \
+	  install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_bug \
 	  PACKAGE_DIR='$(PACKAGE_DIR)' PACKAGE_NAME='$(PACKAGE_NAME)' REAL_VERSION='$(REAL_VERSION)'
 	$(MAKE) -f debian/rules.real install-base
 
-install-image-amd64-$(FEATURESET)-$(FLAVOUR)-plain_image \
-install-image-i386-$(FEATURESET)-$(FLAVOUR)-plain_image:
+install-image_amd64_$(FEATURESET)_$(FLAVOUR)_plain_image \
+install-image_i386_$(FEATURESET)_$(FLAVOUR)_plain_image:
 	cp '$(DIR)/arch/$(KERNEL_ARCH)/boot/bzImage' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
 
-install-image-m68k-$(FEATURESET)-$(FLAVOUR)-plain_image:
+install-image-m68k_$(FEATURESET)_$(FLAVOUR)_plain_image:
 	install -m644 '$(DIR)/vmlinux.gz' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
 
-install-image-powerpc-$(FEATURESET)-$(FLAVOUR)-plain_image:
+install-image-powerpc_$(FEATURESET)_$(FLAVOUR)_plain_image:
 	install -m644 '$(DIR)/vmlinux' $(INSTALL_DIR)/vmlinux-$(REAL_VERSION)
 ifeq ($(KERNEL_ARCH),ppc)
 	# TODO: GNA
@@ -424,18 +424,18 @@
 	  INSTALL_MKVMLINUZ=$(PACKAGE_DIR)/usr/lib/linux-image-$(REAL_VERSION)
 endif
 
-install-image-s390-$(FEATURESET)-$(FLAVOUR)-plain_image:
+install-image_s390_$(FEATURESET)_$(FLAVOUR)_plain_image:
 	cp '$(DIR)/arch/s390/boot/image' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
 
 ifneq ($(INITRAMFS),False)
-install-image-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-plain_templates: ARG_INITRD = YES
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_INITRD = YES
 endif
 
-install-image-powerpc-$(FEATURESET)-$(FLAVOUR)-plain_templates: ARG_KIMAGE = vmlinux
+install-image_powerpc_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_KIMAGE = vmlinux
 
-install-image-s390-$(FEATURESET)-$(FLAVOUR)-plain_templates: ARG_BOOTLOADER = zipl
+install-image_s390_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_BOOTLOADER = zipl
 
-install-image-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-plain_templates:
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_templates:
 	install -d $(PACKAGE_DIR)/DEBIAN
 	for i in $(notdir $(wildcard debian/templates/temp.image.plain/*)); do \
 	  sed \
@@ -459,13 +459,13 @@
 	chmod 755 '$(PACKAGE_DIR)'/DEBIAN/{config,{pre,post}*}
 	chmod 644 '$(PACKAGE_DIR)'/DEBIAN/templates
 
-install-image-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-plain_bug:
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_bug:
 	dh_installdirs usr/share/bug/$(PACKAGE_NAME)
 	dh_install debian/templates/image.plain.bug/* usr/share/bug/$(PACKAGE_NAME)
 	chmod 755 '$(PACKAGE_DIR)'/usr/share/bug/$(PACKAGE_NAME)/script
 	echo "RELEASE='$(REAL_VERSION)'" > '$(PACKAGE_DIR)'/usr/share/bug/$(PACKAGE_NAME)/info
 
-install-image-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-plain-s390-tape:
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-s390-tape:
 	dh_testdir
 	dh_testroot
 	dh_clean -d -k
@@ -473,10 +473,10 @@
 	cp '$(DIR)/arch/s390/boot/image' $(PACKAGE_DIR)/boot/vmlinuz-$(REAL_VERSION)
 	$(MAKE) -f debian/rules.real install-base
 
-install-image-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-plain-xen: MODULES_PACKAGE_NAME = linux-modules-$(REAL_VERSION)
-install-image-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-plain-xen: MODULES_PACKAGE_DIR = $(CURDIR)/debian/$(MODULES_PACKAGE_NAME)
-install-image-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-plain-xen: DH_OPTIONS = -p$(PACKAGE_NAME) -p$(MODULES_PACKAGE_NAME)
-install-image-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-plain-xen:
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-xen: MODULES_PACKAGE_NAME = linux-modules-$(REAL_VERSION)
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-xen: MODULES_PACKAGE_DIR = $(CURDIR)/debian/$(MODULES_PACKAGE_NAME)
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-xen: DH_OPTIONS = -p$(PACKAGE_NAME) -p$(MODULES_PACKAGE_NAME)
+install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-xen:
 	dh_testdir
 	dh_testroot
 	dh_clean -d -k



More information about the Kernel-svn-changes mailing list