[kernel] r6057 - in dists/trunk/linux-nonfree-2.6: . debian debian/arch debian/bin debian/templates

Bastian Blank waldi at costa.debian.org
Sat Mar 4 15:20:44 UTC 2006 

Author: waldi
Date: Sat Mar  4 15:20:42 2006
New Revision: 6057

Removed:
   dists/trunk/linux-nonfree-2.6/debian/bin/
Modified:
   dists/trunk/linux-nonfree-2.6/   (props changed)
   dists/trunk/linux-nonfree-2.6/debian/arch/kconfig
   dists/trunk/linux-nonfree-2.6/debian/changelog
   dists/trunk/linux-nonfree-2.6/debian/rules
   dists/trunk/linux-nonfree-2.6/debian/rules.real
   dists/trunk/linux-nonfree-2.6/debian/templates/control.modules.in
   dists/trunk/linux-nonfree-2.6/debian/templates/control.source.in
Log:
r5289:  waldi | 2006-01-05 19:10:06 +0100
debian/bin: Remove.

r5290:  waldi | 2006-01-05 19:11:45 +0100
* debian/templates/control.modules.in: Fix subarch in package name.
* debian/templates/control.source.in: Remove compiler settings from build deps.

r5291:  waldi | 2006-01-05 19:12:08 +0100
debian/rules.real: Support subarch.

r5292:  waldi | 2006-01-05 19:12:29 +0100
debian/changelog: Update.

r5293:  waldi | 2006-01-05 19:14:19 +0100
debian/arch/kconfig: Remove old options.

r6044:  waldi | 2006-03-03 17:26:01 +0100
* debian/changelog: Update.
* debian/rules: Use scripts supplied by linux-headers-X.
* debian/rules.real: Update.
* debian/templates/control.modules.in: Adopt changes.

r6048:  waldi | 2006-03-03 17:33:18 +0100
debian/rules: Include rules.include from headers package.

r6051:  waldi | 2006-03-03 19:49:54 +0100
debian/rules.real: Fix installation.


Modified: dists/trunk/linux-nonfree-2.6/debian/arch/kconfig
==============================================================================
--- dists/trunk/linux-nonfree-2.6/debian/arch/kconfig	(original)
+++ dists/trunk/linux-nonfree-2.6/debian/arch/kconfig	Sat Mar  4 15:20:42 2006
@@ -15,11 +15,5 @@
 CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
 CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
 CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_SCSI_QLA21XX=m
-CONFIG_SCSI_QLA22XX=m
-CONFIG_SCSI_QLA2300=m
-CONFIG_SCSI_QLA2322=m
-CONFIG_SCSI_QLA6312=m
-CONFIG_SCSI_QLA24XX=m
 CONFIG_USB_EMI62=m
 CONFIG_USB_DABUSB=m

Modified: dists/trunk/linux-nonfree-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-nonfree-2.6/debian/changelog	(original)
+++ dists/trunk/linux-nonfree-2.6/debian/changelog	Sat Mar  4 15:20:42 2006
@@ -1,6 +1,6 @@
-linux-nonfree-2.6 (2.6.13+2.6.14-rc5-1) UNRELEASED; urgency=low
+linux-nonfree-2.6 (2.6.15+2.6.16-rc5-1) UNRELEASED; urgency=low
 
   *
 
- -- Bastian Blank <waldi at debian.org>  Tue, 23 Aug 2005 22:29:33 +0200
+ -- Bastian Blank <waldi at debian.org>  Thu, 05 Jan 2006 18:35:11 +0000
 

Modified: dists/trunk/linux-nonfree-2.6/debian/rules
==============================================================================
--- dists/trunk/linux-nonfree-2.6/debian/rules	(original)
+++ dists/trunk/linux-nonfree-2.6/debian/rules	Sat Mar  4 15:20:42 2006
@@ -1,24 +1,11 @@
 #!/usr/bin/make -f
-#
-# Generally nothing needs to be modified below this line
-#
 SHELL    := sh -e
-DEB_HOST_ARCH  := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 srcver   := $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
 VERSION  := $(shell echo $(srcver) | sed -e 's,-[^-]*$$,,')
 MAJOR    := $(word 1,$(subst ., ,$(VERSION))).$(word 2,$(subst ., ,$(VERSION)))
+UPSTREAMVERSION  := $(shell echo $(VERSION) | sed -e 's,^[^+]*+,,' -e 's,-rc[0-9]*$$,,')
 
-include debian/rules.defs
-
-build: debian/control $(STAMPS_DIR)/build-stamp
-$(STAMPS_DIR)/build-stamp: $(BUILD_DIR) $(STAMPS_DIR)
-	dh_testdir
-	$(MAKE) -f debian/rules.gen build-$(DEB_HOST_ARCH)
-	touch $@
-
-$(BUILD_DIR) $(STAMPS_DIR):
-	@[ -d $@ ] || mkdir $@
+include /usr/src/linux-headers-$(UPSTREAMVERSION)/modules/rules.include
 
 orig: ../orig/linux-nonfree-$(MAJOR)-$(VERSION)
 	rsync --delete --exclude debian --exclude .svn -av ../orig/linux-nonfree-$(MAJOR)-$(VERSION)/ .
@@ -35,47 +22,3 @@
 maintainerclean:
 	rm -rf $(filter-out debian, $(wildcard *))
 
-clean: unpatch
-	dh_testdir
-	rm -f version.Debian
-	cd debian; rm -f *.kpatches.arch
-	rm -rf $(BUILD_DIR) $(STAMPS_DIR) debian/lib/python/*.pyc
-	dh_clean
-
-binary-indep:
-	dh_testdir
-	$(MAKE) -f debian/rules.gen binary-indep
-
-binary-arch:
-	dh_testdir
-	$(MAKE) -f debian/rules.gen binary-arch-$(DEB_HOST_ARCH)
-
-binary:	binary-indep binary-arch
-
-#
-# Makes the master debian/control file by substituting
-# variable values into the template.
-#
-CONTROL_FILES = debian/changelog $(wildcard debian/templates/control.*) 
-CONTROL_FILES += debian/arch/defines $(wildcard debian/arch/*/defines) $(wildcard debian/arch/*/*/defines)
-debian/control debian/rules.gen: debian/bin/gencontrol.py $(CONTROL_FILES)
-	if [ -f debian/control.md5sum ]; then \
-		if md5sum $^ | diff - debian/control.md5sum > /dev/null; then true; else \
-			$(MAKE) -f debian/rules debian/control-real; \
-		fi \
-	else \
-		$(MAKE) -f debian/rules debian/control-real; \
-	fi
-
-debian/control-real: debian/bin/gencontrol.py $(CONTROL_FILES)
-	$<
-	md5sum $^ > debian/control.md5sum
-	@echo
-	@echo This target is made to fail intentionally, to make sure
-	@echo that it is NEVER run during the automated build. Please
-	@echo ignore the following error, the debian/control file has
-	@echo been generated SUCCESSFULLY.
-	@echo
-	exit 1
-
-.PHONY: clean build setup binary-indep binary-arch binary patch unpatch source tree

Modified: dists/trunk/linux-nonfree-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-nonfree-2.6/debian/rules.real	(original)
+++ dists/trunk/linux-nonfree-2.6/debian/rules.real	Sat Mar  4 15:20:42 2006
@@ -3,11 +3,9 @@
 DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -a$(ARCH) -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_ARCH    := $(shell dpkg-architecture -a$(ARCH) -qDEB_BUILD_ARCH)
 
-ifneq ($(SUBARCH),none)
-  KPGK_SUBARCH := $(SUBARCH)-
-endif
+export DH_OPTIONS
 
-HEADERS_DIR = /usr/src/linux-headers-$(KPGK_SUBARCH)$(UPSTREAM_VERSION)$(KPKG_ABINAME)-$(FLAVOUR)
+HEADERS_DIR = /usr/src/linux-headers-$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)
 
 include debian/rules.defs
 
@@ -20,13 +18,13 @@
 
 build: $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 
-$(BUILD_DIR)/linux-nonfree-source-$(UPSTREAM_VERSION).tar.bz2: SOURCE_DIR=$(BUILD_DIR)/source
-$(BUILD_DIR)/linux-nonfree-source-$(UPSTREAM_VERSION).tar.bz2: DIR = $(BUILD_DIR)/linux-nonfree-source-$(UPSTREAM_VERSION)
-$(BUILD_DIR)/linux-nonfree-source-$(UPSTREAM_VERSION).tar.bz2: $(STAMPS_DIR)/source
+$(BUILD_DIR)/linux-nonfree-source-$(UPSTREAMVERSION).tar.bz2: SOURCE_DIR=$(BUILD_DIR)/source
+$(BUILD_DIR)/linux-nonfree-source-$(UPSTREAMVERSION).tar.bz2: DIR = $(BUILD_DIR)/linux-nonfree-source-$(UPSTREAMVERSION)
+$(BUILD_DIR)/linux-nonfree-source-$(UPSTREAMVERSION).tar.bz2: $(STAMPS_DIR)/source
 	rm -rf '$@' '$(DIR)'
 	cp -al '$(SOURCE_DIR)' '$(DIR)'
 	chmod -R u+rw,go=rX '$(DIR)'
-	cd '$(BUILD_DIR)'; tar -cjf 'linux-nonfree-source-$(UPSTREAM_VERSION).tar.bz2' 'linux-nonfree-source-$(UPSTREAM_VERSION)'
+	cd '$(BUILD_DIR)'; tar -cjf 'linux-nonfree-source-$(UPSTREAMVERSION).tar.bz2' 'linux-nonfree-source-$(UPSTREAMVERSION)'
 	rm -rf '$(DIR)'
 
 srcfiles := $(filter-out debian, $(wildcard *))
@@ -61,6 +59,8 @@
 	touch $@
 
 install-base:
+	dh_installchangelogs
+	dh_installdocs
 	dh_compress
 	dh_fixperms
 	dh_installdeb
@@ -68,24 +68,24 @@
 	dh_md5sums
 	dh_builddeb
 
-install-modules-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DIR = $(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
-install-modules-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DEST_DIR = $(CURDIR)/debian/linux-modules-nonfree-$(KPKG_SUBARCH)$(VERSION)-$(ABINAME)-$(FLAVOUR)/lib/modules/$(UPSTREAM_VERSION)$(KPKG_ABINAME)-$(FLAVOUR)
-install-modules-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DH_OPTIONS = -plinux-modules-nonfree-$(KPKG_SUBARCH)$(VERSION)-$(ABINAME)-$(FLAVOUR)
-install-modules-$(ARCH)-$(SUBARCH)-$(FLAVOUR):
+install-modules-$(ARCH)-$(SUBARCH)-$(FLAVOUR): REAL_VERSION = $(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)
+install-modules-$(ARCH)-$(SUBARCH)-$(FLAVOUR): PACKAGE_NAME = linux-modules-nonfree-$(REAL_VERSION)
+install-modules-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DH_OPTIONS = -p$(PACKAGE_NAME)
+install-modules-$(ARCH)-$(SUBARCH)-$(FLAVOUR): BASE_DIR = /lib/modules/$(REAL_VERSION)
+install-modules-$(ARCH)-$(SUBARCH)-$(FLAVOUR): SOURCE_DIR = $(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
+install-modules-$(ARCH)-$(SUBARCH)-$(FLAVOUR): PACKAGE_DIR = $(CURDIR)/debian/$(PACKAGE_NAME)
+install-modules-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DIR = $(PACKAGE_DIR)/$(BASE_DIR)
+install-modules-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 	dh_testdir
 	dh_testroot
-	dh_installdirs $(DH_OPTIONS) 
-	cd $(DIR); env -u MAKEFLAGS ARCH=$(KERNEL_ARCH) make install DIR=/usr/src/linux-headers-$(KPGK_SUBARCH)$(UPSTREAM_VERSION)$(KPKG_ABINAME)-$(FLAVOUR) MODLIB=$(DEST_DIR) INSTALL_MOD_DIR=nonfree
-	dh_installdocs $(DH_OPTIONS)
-	dh_installchangelogs $(DH_OPTIONS)
-	$(MAKE) -f debian/rules.real install-base DH_OPTIONS=$(DH_OPTIONS)
+	dh_installdirs
+	cd $(SOURCE_DIR); env -u MAKEFLAGS ARCH=$(KERNEL_ARCH) make install DIR=$(HEADERS_DIR) MODLIB=$(DIR) INSTALL_MOD_DIR=nonfree
+	$(MAKE) -f debian/rules.real install-base
 
 install-source: DH_OPTIONS = -plinux-nonfree-source-$(VERSION)
-install-source: $(BUILD_DIR)/linux-nonfree-source-$(UPSTREAM_VERSION).tar.bz2
+install-source: $(BUILD_DIR)/linux-nonfree-source-$(UPSTREAMVERSION).tar.bz2
 	dh_testdir
 	dh_testroot
-	dh_install $(DH_OPTIONS) '$<' /usr/src
-	dh_installdocs $(DH_OPTIONS)
-	dh_installchangelogs $(DH_OPTIONS)
-	$(MAKE) -f debian/rules.real install-base DH_OPTIONS='$(DH_OPTIONS)'
+	dh_install '$<' /usr/src
+	$(MAKE) -f debian/rules.real install-base
 

Modified: dists/trunk/linux-nonfree-2.6/debian/templates/control.modules.in
==============================================================================
--- dists/trunk/linux-nonfree-2.6/debian/templates/control.modules.in	(original)
+++ dists/trunk/linux-nonfree-2.6/debian/templates/control.modules.in	Sat Mar  4 15:20:42 2006
@@ -1,4 +1,4 @@
-Package: linux-modules-nonfree- at subarch@@version at -@abiname at -@flavour@
+Package: linux-modules-nonfree- at upstreamversion@@abiname@@localversion@
 Section: non-free/base
 Priority: optional
 Description: Non-free modules for the Linux kernel version @version@

Modified: dists/trunk/linux-nonfree-2.6/debian/templates/control.source.in
==============================================================================
--- dists/trunk/linux-nonfree-2.6/debian/templates/control.source.in	(original)
+++ dists/trunk/linux-nonfree-2.6/debian/templates/control.source.in	Sat Mar  4 15:20:42 2006
@@ -4,4 +4,4 @@
 Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
 Uploaders: Andres Salomon <dilinger at debian.org>, Bastian Blank <waldi at debian.org>
 Standards-Version: 3.6.1.0
-Build-Depends: gcc (>= 4:4.0) [!arm !sparc !alpha !m68k], gcc-3.3 [arm sparc alpha m68k], binutils-hppa64 [hppa], gcc-4.0-hppa64 [hppa], debhelper (>= 4.1.0), module-init-tools
+Build-Depends: debhelper (>= 4.1.0), module-init-tools

More information about the Kernel-svn-changes mailing list