debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

debian/bin/gencontrol.py, debian/rules.real: 

Remove remaining code for s390 tape images.

svn path=/dists/trunk/linux/; revision=19551
This commit is contained in:
Bastian Blank 2012-11-27 18:39:04 +00:00
parent fc7e60a278
commit 9d6c7c99a5
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debian/bin/gencontrol.py vendored
View File

@ -266,10 +266,7 @@ class Gencontrol(Base):
packages_dummy = []
packages_own = []
if config_entry_image['type'] == 'plain-s390-tape':
image = self.templates["control.image.type-standalone"]
else:
image = self.templates["control.image.type-%s" % config_entry_image['type']]
image = self.templates["control.image.type-%s" % config_entry_image['type']]
config_entry_xen = self.config.merge('xen', arch, featureset, flavour)
if config_entry_xen:

13
debian/rules.real vendored
View File

@ -156,12 +156,7 @@ endif
$(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)
$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-s390-tape: BUILD_TARGET = image
$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-s390x-tape: BUILD_TARGET = image
$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain \
$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-s390-tape \
$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-s390x-tape:
+$(MAKE_CLEAN) -C '$(DIR)' $(BUILD_TARGET)
python debian/bin/buildcheck.py $(DIR) $(ARCH) $(FEATURESET) $(FLAVOUR)
@$(stamp)
@ -462,14 +457,6 @@ install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_bug:
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_prep
dh_installdirs 'boot'
install -m644 '$(DIR)/arch/s390/boot/image' $(PACKAGE_DIR)/boot/vmlinuz-$(REAL_VERSION)
+$(MAKE_SELF) install-base
install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): REAL_VERSION = $(ABINAME)$(LOCALVERSION)
install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_NAME = linux-image-$(REAL_VERSION)-dbg
install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_DIR = debian/$(PACKAGE_NAME)