Author: waldi
Date: Sun Jul 29 14:40:42 2007
New Revision: 9219
Log:
debian/bin/gencontrol.py, debian/lib/python/debian_linux/gencontrol.py,
debian/rules.real: Use featureset instead of subarch.
Modified:
dists/trunk/linux-2.6/debian/bin/gencontrol.py
dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
dists/trunk/linux-2.6/debian/rules.real
Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py (original)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py Sun Jul 29 14:40:42 2007
@@ -72,9 +72,9 @@
packages.append(package_headers)
cmds_binary_arch = []
- cmds_binary_arch.append(("$(MAKE) -f debian/rules.real
binary-arch-subarch %s" % makeflags,))
+ cmds_binary_arch.append(("$(MAKE) -f debian/rules.real
binary-arch-featureset %s" % makeflags,))
cmds_source = []
- cmds_source.append(("$(MAKE) -f debian/rules.real source-subarch %s" %
makeflags,))
+ cmds_source.append(("$(MAKE) -f debian/rules.real source-featureset
%s" % makeflags,))
makefile.append(("binary-arch-%s-%s-real:" % (arch, featureset),
cmds_binary_arch))
makefile.append("build-%s-%s-real:" % (arch, featureset))
makefile.append(("setup-%s-%s-real:" % (arch, featureset)))
Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
(original)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py Sun Jul
29 14:40:42 2007
@@ -139,7 +139,7 @@
config_entry = self.config['base', arch, featureset]
vars.update(config_entry)
- makeflags['SUBARCH'] = featureset
+ makeflags['FEATURESET'] = featureset
if featureset != 'none':
vars['localversion'] += '-' + featureset
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 Sun Jul 29 14:40:42 2007
@@ -34,7 +34,7 @@
ifdef KPKG_SUBARCH
kpkg_image += --subarch '$(KPKG_SUBARCH)'
endif
-setup_env := env -u ABINAME -u ARCH -u SUBARCH -u FLAVOUR -u VERSION -u
LOCALVERSION -u MAKEFLAGS
+setup_env := env -u ABINAME -u ARCH -u FEATURESET -u FLAVOUR -u VERSION -u
LOCALVERSION -u MAKEFLAGS
ifdef DEBIAN_KERNEL_JOBS
setup_env_kpkg_jobs = CONCURRENCY_LEVEL=$(DEBIAN_KERNEL_JOBS)
@@ -48,10 +48,10 @@
#
binary-arch-arch: install-headers-$(ARCH)
binary-arch-arch: install-libc-dev_$(ARCH)
-binary-arch-subarch: install-headers-$(ARCH)-$(SUBARCH)
-binary-arch-flavour: install-image-$(ARCH)-$(SUBARCH)-$(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)-$(SUBARCH)-$(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)-$(SUBARCH)-$(FLAVOUR)-$(TYPE)
+build: $(STAMPS_DIR)/build-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-$(TYPE)
-setup-flavour: $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE)
+setup-flavour: $(STAMPS_DIR)/setup-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-$(TYPE)
source-arch: $(STAMPS_DIR)/source
-source-subarch: $(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH)
+source-featureset: $(STAMPS_DIR)/source-$(ARCH)-$(FEATURESET)
-$(BUILD_DIR)/config.$(ARCH)-$(SUBARCH)-$(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)-$(SUBARCH): SOURCE_DIR=$(BUILD_DIR)/source
-$(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH):
DIR=$(BUILD_DIR)/source-$(ARCH)-$(SUBARCH)
-$(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH): $(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 $(SUBARCH)
+ $(patch_cmd) -a $(ARCH) -s $(FEATURESET)
touch '$@'
-setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-all:
CONFIG=$(BUILD_DIR)/config.$(ARCH)-$(SUBARCH)-$(FLAVOUR)
-setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-all:
SOURCE_DIR=$(BUILD_DIR)/source-$(ARCH)-$(SUBARCH)
-setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-all:
DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
-setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-all:
$(BUILD_DIR)/config.$(ARCH)-$(SUBARCH)-$(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,37 +123,37 @@
echo 'CFLAGS += $(CFLAGS)' >> '$(DIR)/.kernelvariables'
cd '$(DIR)'; $(setup_env) make reportoldconfig
-$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE):
DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
-$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE):
$(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH)
+$(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)-$(SUBARCH)-$(FLAVOUR)-kernel-package:
- $(MAKE) -f debian/rules.real setup-$(ARCH)-$(SUBARCH)-$(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)-$(SUBARCH)-$(FLAVOUR)-plain \
-$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-s390-tape \
-$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen:
- $(MAKE) -f debian/rules.real setup-$(ARCH)-$(SUBARCH)-$(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)-$(SUBARCH)-$(FLAVOUR)-$(TYPE):
DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
-$(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE):
$(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(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)-$(SUBARCH)-$(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) $(SUBARCH) $(FLAVOUR)
+ python2.4 debian/bin/abicheck.py $(DIR) $(ARCH) $(FEATURESET) $(FLAVOUR)
touch '$@'
-$(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain \
-$(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-s390-tape \
-$(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(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) $(SUBARCH) $(FLAVOUR)
+ python2.4 debian/bin/abicheck.py $(DIR) $(ARCH) $(FEATURESET) $(FLAVOUR)
touch '$@'
$(STAMPS_DIR)/build-doc: SOURCE_DIR=$(BUILD_DIR)/source
@@ -224,12 +224,12 @@
dh_testroot
$(MAKE) -f debian/rules.real install-base
GENCONTROL_ARGS='-Vkernel:Arch=$(ARCH)'
-install-headers-$(ARCH)-$(SUBARCH): PACKAGE_NAME =
linux-headers-$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION_HEADERS)
-install-headers-$(ARCH)-$(SUBARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
-install-headers-$(ARCH)-$(SUBARCH): BASE_DIR = /usr/src/$(PACKAGE_NAME)
-install-headers-$(ARCH)-$(SUBARCH): SOURCE_DIR =
$(BUILD_DIR)/source-$(ARCH)-$(SUBARCH)
-install-headers-$(ARCH)-$(SUBARCH): DIR =
$(CURDIR)/debian/$(PACKAGE_NAME)/$(BASE_DIR)
-install-headers-$(ARCH)-$(SUBARCH): $(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH)
+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)-$(SUBARCH)-$(FLAVOUR): REAL_VERSION =
$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)
-install-headers-$(ARCH)-$(SUBARCH)-$(FLAVOUR): PACKAGE_NAME =
linux-headers-$(REAL_VERSION)
-install-headers-$(ARCH)-$(SUBARCH)-$(FLAVOUR): PACKAGE_NAME_HEADERS =
linux-headers-$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION_HEADERS)
-install-headers-$(ARCH)-$(SUBARCH)-$(FLAVOUR): PACKAGE_NAME_KBUILD =
linux-kbuild-$(VERSION)
-install-headers-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DH_OPTIONS = -p$(PACKAGE_NAME)
-install-headers-$(ARCH)-$(SUBARCH)-$(FLAVOUR): BASE_DIR =
/usr/src/$(PACKAGE_NAME)
-install-headers-$(ARCH)-$(SUBARCH)-$(FLAVOUR): SOURCE_DIR =
$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
-install-headers-$(ARCH)-$(SUBARCH)-$(FLAVOUR): REF_DIR =
$(BUILD_DIR)/source-$(ARCH)-$(SUBARCH)
-install-headers-$(ARCH)-$(SUBARCH)-$(FLAVOUR): PACKAGE_DIR =
$(CURDIR)/debian/$(PACKAGE_NAME)
-install-headers-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DIR = $(PACKAGE_DIR)/$(BASE_DIR)
-install-headers-$(ARCH)-$(SUBARCH)-$(FLAVOUR):
$(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(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)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): REAL_VERSION =
$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)
-install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): PACKAGE_NAME =
linux-image-$(REAL_VERSION)
-install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): PACKAGE_DIR =
$(CURDIR)/debian/$(PACKAGE_NAME)
-install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): INSTALL_DIR =
$(PACKAGE_DIR)/boot
-install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): DIR =
$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
-install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): DH_OPTIONS =
-p$(PACKAGE_NAME)
-install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE):
$(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(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)-$(SUBARCH)-$(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)-$(SUBARCH)-$(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)-$(SUBARCH)-$(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)-$(SUBARCH)-$(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)-$(SUBARCH)-$(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-$(SUBARCH)-$(FLAVOUR)-plain_image \
-install-image-i386-$(SUBARCH)-$(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-$(SUBARCH)-$(FLAVOUR)-plain_image:
+install-image-m68k-$(FEATURESET)-$(FLAVOUR)-plain_image:
install -m644 '$(DIR)/vmlinux.gz' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
-install-image-powerpc-$(SUBARCH)-$(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-$(SUBARCH)-$(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)-$(SUBARCH)-$(FLAVOUR)-plain_templates: ARG_INITRD = YES
+install-image-$(ARCH)-$(FEATURESET)-$(FLAVOUR)-plain_templates: ARG_INITRD =
YES
endif
-install-image-powerpc-$(SUBARCH)-$(FLAVOUR)-plain_templates: ARG_KIMAGE =
vmlinux
+install-image-powerpc-$(FEATURESET)-$(FLAVOUR)-plain_templates: ARG_KIMAGE =
vmlinux
-install-image-s390-$(SUBARCH)-$(FLAVOUR)-plain_templates: ARG_BOOTLOADER = zipl
+install-image-s390-$(FEATURESET)-$(FLAVOUR)-plain_templates: ARG_BOOTLOADER =
zipl
-install-image-$(ARCH)-$(SUBARCH)-$(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)-$(SUBARCH)-$(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)-$(SUBARCH)-$(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)-$(SUBARCH)-$(FLAVOUR)-plain-xen: MODULES_PACKAGE_NAME =
linux-modules-$(REAL_VERSION)
-install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen: MODULES_PACKAGE_DIR =
$(CURDIR)/debian/$(MODULES_PACKAGE_NAME)
-install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen: DH_OPTIONS =
-p$(PACKAGE_NAME) -p$(MODULES_PACKAGE_NAME)
-install-image-$(ARCH)-$(SUBARCH)-$(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
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
