[kernel] r12328 - in people/waldi/xen-extra/linux-2.6.18-xen-3/debian: . bin
Bastian Blank
waldi at alioth.debian.org
Fri Oct 17 14:01:31 UTC 2008
Author: waldi
Date: Fri Oct 17 14:01:28 2008
New Revision: 12328
Log:
* debian/bin/gencontrol.py: Fix missing localversion for the image.
* debian/rules.real
- Fix location of compressed kernel.
- Remove unused code.
Modified:
people/waldi/xen-extra/linux-2.6.18-xen-3/debian/bin/gencontrol.py
people/waldi/xen-extra/linux-2.6.18-xen-3/debian/rules.real
Modified: people/waldi/xen-extra/linux-2.6.18-xen-3/debian/bin/gencontrol.py
==============================================================================
--- people/waldi/xen-extra/linux-2.6.18-xen-3/debian/bin/gencontrol.py (original)
+++ people/waldi/xen-extra/linux-2.6.18-xen-3/debian/bin/gencontrol.py Fri Oct 17 14:01:28 2008
@@ -85,6 +85,8 @@
config_base = self.config.merge('base', arch, featureset, flavour)
config_image = self.config.merge('image', arch, featureset, flavour)
+ vars['localversion-image'] = vars['localversion']
+
data = vars.copy()
data.update(config_base)
data.update(config_image)
Modified: people/waldi/xen-extra/linux-2.6.18-xen-3/debian/rules.real
==============================================================================
--- people/waldi/xen-extra/linux-2.6.18-xen-3/debian/rules.real (original)
+++ people/waldi/xen-extra/linux-2.6.18-xen-3/debian/rules.real Fri Oct 17 14:01:28 2008
@@ -354,106 +354,6 @@
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:
- cd '$(DIR)'; $(kpkg_image) kernel-image
- cat '$(DIR)/debian/files' >> debian/files
- @for i in $$(awk '{ print $$1; }' '$(DIR)/debian/files'); do \
- echo "mv \"$(BUILD_DIR)/$$i\" .."; \
- mv "$(BUILD_DIR)/$$i" ..; \
- done
-
-install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain:
- dh_testdir
- dh_testroot
- dh_clean -d -k
- dh_installdirs 'boot'
- $(MAKE_SELF) \
- install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_image \
- DIR='$(DIR)' PACKAGE_DIR='$(PACKAGE_DIR)' INSTALL_DIR='$(INSTALL_DIR)' REAL_VERSION='$(REAL_VERSION)'
-ifeq ($(MODULES),True)
- $(MAKE_CLEAN) -C $(DIR) modules_install INSTALL_MOD_PATH='$(CURDIR)'/$(PACKAGE_DIR)
- cp $(DIR)/.config $(PACKAGE_DIR)/boot/config-$(REAL_VERSION)
- cp $(DIR)/System.map $(PACKAGE_DIR)/boot/System.map-$(REAL_VERSION)
- rm $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/{build,source,modules.*}
-endif
- $(MAKE_SELF) \
- install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_templates \
- PACKAGE_DIR='$(PACKAGE_DIR)' REAL_VERSION='$(REAL_VERSION)'
- $(MAKE_SELF) \
- install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_bug \
- PACKAGE_DIR='$(PACKAGE_DIR)' PACKAGE_NAME='$(PACKAGE_NAME)' REAL_VERSION='$(REAL_VERSION)'
- $(MAKE_SELF) install-base
-
-install-image_amd64_$(FEATURESET)_$(FLAVOUR)_plain_image \
-install-image_i386_$(FEATURESET)_$(FLAVOUR)_plain_image:
- install -m644 '$(DIR)/arch/$(KERNEL_ARCH)/boot/bzImage' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
-
-install-image_m68k_$(FEATURESET)_$(FLAVOUR)_plain_image:
- install -m644 '$(DIR)/vmlinux.gz' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
-
-install-image_powerpc_$(FEATURESET)_$(FLAVOUR)_plain_image: WRAPPER_INSTALL_DIR = '$(CURDIR)'/$(PACKAGE_DIR)/usr/lib/linux-image-$(REAL_VERSION)
-install-image_powerpc_$(FEATURESET)_$(FLAVOUR)_plain_image:
- install -m644 '$(DIR)/vmlinux' $(INSTALL_DIR)/vmlinux-$(REAL_VERSION)
-ifeq ($(KERNEL_ARCH),ppc)
- # TODO: GNA
- $(MAKE_CLEAN) -C '$(DIR)/arch/ppc/boot' mkvmlinuz_support_install \
- INSTALL_MKVMLINUZ='$(WRAPPER_INSTALL_DIR)'
-else
- $(MAKE_CLEAN) -C '$(DIR)' bootwrapper_install \
- WRAPPER_OBJDIR='$(WRAPPER_INSTALL_DIR)' \
- WRAPPER_DTSDIR='$(WRAPPER_INSTALL_DIR)'/dts \
- WRAPPER_BINDIR='$(WRAPPER_INSTALL_DIR)'
-endif
-
-install-image_s390_$(FEATURESET)_$(FLAVOUR)_plain_image:
- install -m644 '$(DIR)/arch/s390/boot/image' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
-
-ifneq ($(INITRAMFS),False)
-install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_INITRD = YES
-endif
-
-install-image_powerpc_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_KIMAGE = vmlinux
-
-install-image_s390_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_BOOTLOADER = zipl
-
-install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_templates:
- install -d $(PACKAGE_DIR)/DEBIAN
- for i in $(wildcard debian/templates/temp.image.plain/*); do \
- sed \
- -e 's,=D,/boot,g' \
- -e 's/=OF/YES/g' \
- -e 's/=ST/linux/g' \
- -e 's@=A@$(DEB_HOST_ARCH)@g' \
- -e 's@=B@$(KERNEL_ARCH)@g' \
- -e 's/=IB//g' \
- -e 's/=I/$(ARG_INITRD)/g' \
- -e 's/=K/$(ARG_KIMAGE)/g' \
- -e 's/=L/$(ARG_BOOTLOADER)/g' \
- -e 's@=MK@$(INITRD_CMD)@g' \
- -e 's/=V/$(REAL_VERSION)/g' \
- -e 's/=M//g' \
- -e 's/=MD//g' \
- -e 's/=R//g' \
- -e 's/=S//g' \
- $$i > $(PACKAGE_DIR)/DEBIAN/$$(basename $$i); \
- done
- chmod 755 $(PACKAGE_DIR)/DEBIAN/{config,{pre,post}*}
- chmod 644 $(PACKAGE_DIR)/DEBIAN/templates
-
-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:
- dh_testdir
- dh_testroot
- dh_clean -d -k
- dh_installdirs 'boot'
- install -m644 '$(DIR)/arch/s390/boot/image' $(PACKAGE_DIR)/boot/vmlinuz-$(REAL_VERSION)
- $(MAKE_SELF) 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 = debian/$(MODULES_PACKAGE_NAME)
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-xen: DH_OPTIONS =
@@ -463,7 +363,7 @@
dh_clean -d -k
dh_installdirs -p$(PACKAGE_NAME) boot 'var/lib/$(PACKAGE_NAME)'
dh_installdirs -p$(MODULES_PACKAGE_NAME) boot
- cp '$(DIR)'/arch/$(KERNEL_ARCH)/boot/vmlinuz $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
+ cp '$(DIR)'/vmlinuz $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
$(MAKE_CLEAN) -C $(DIR) modules_install INSTALL_MOD_PATH='$(CURDIR)'/$(MODULES_PACKAGE_DIR)
cp $(DIR)/.config $(MODULES_PACKAGE_DIR)/boot/config-$(REAL_VERSION)
cp $(DIR)/System.map $(MODULES_PACKAGE_DIR)/boot/System.map-$(REAL_VERSION)
More information about the Kernel-svn-changes
mailing list