[kernel] r6044 - in people/waldi/linux-nonfree-2.6/debian: . templates

Bastian Blank waldi at costa.debian.org
Fri Mar 3 16:26:02 UTC 2006 

Author: waldi
Date: Fri Mar  3 16:26:01 2006
New Revision: 6044

Modified:
   people/waldi/linux-nonfree-2.6/debian/changelog
   people/waldi/linux-nonfree-2.6/debian/rules
   people/waldi/linux-nonfree-2.6/debian/rules.real
   people/waldi/linux-nonfree-2.6/debian/templates/control.modules.in
Log:
* debian/changelog: Update.
* debian/rules: Use scripts supplied by linux-headers-X.
* debian/rules.real: Update.
* debian/templates/control.modules.in: Adopt changes.


Modified: people/waldi/linux-nonfree-2.6/debian/changelog
==============================================================================
--- people/waldi/linux-nonfree-2.6/debian/changelog	(original)
+++ people/waldi/linux-nonfree-2.6/debian/changelog	Fri Mar  3 16:26:01 2006
@@ -1,4 +1,4 @@
-linux-nonfree-2.6 (2.6.15-1) UNRELEASED; urgency=low
+linux-nonfree-2.6 (2.6.15+2.6.16-rc5-1) UNRELEASED; urgency=low
 
   *
 

Modified: people/waldi/linux-nonfree-2.6/debian/rules
==============================================================================
--- people/waldi/linux-nonfree-2.6/debian/rules	(original)
+++ people/waldi/linux-nonfree-2.6/debian/rules	Fri Mar  3 16:26:01 2006
@@ -8,6 +8,7 @@
 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
 
@@ -35,11 +36,9 @@
 maintainerclean:
 	rm -rf $(filter-out debian, $(wildcard *))
 
-clean: unpatch
+clean: debian/control
 	dh_testdir
-	rm -f version.Debian
-	cd debian; rm -f *.kpatches.arch
-	rm -rf $(BUILD_DIR) $(STAMPS_DIR) debian/lib/python/*.pyc
+	rm -rf $(BUILD_DIR) $(STAMPS_DIR)
 	dh_clean
 
 binary-indep:
@@ -58,7 +57,7 @@
 #
 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)
+debian/control debian/rules.gen: /usr/src/linux-headers-$(UPSTREAMVERSION)/modules/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; \
@@ -67,7 +66,7 @@
 		$(MAKE) -f debian/rules debian/control-real; \
 	fi
 
-debian/control-real: debian/bin/gencontrol.py $(CONTROL_FILES)
+debian/control-real: /usr/src/linux-headers-$(UPSTREAMVERSION)/modules/gencontrol.py $(CONTROL_FILES)
 	$<
 	md5sum $^ > debian/control.md5sum
 	@echo

Modified: people/waldi/linux-nonfree-2.6/debian/rules.real
==============================================================================
--- people/waldi/linux-nonfree-2.6/debian/rules.real	(original)
+++ people/waldi/linux-nonfree-2.6/debian/rules.real	Fri Mar  3 16:26:01 2006
@@ -3,13 +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)
 
-ifeq ($(SUBARCH),none)
-  LOCALVERSION := -$(FLAVOUR)
-else
-  LOCALVERSION := -$(SUBARCH)-$(FLAVOUR)
-endif
+export DH_OPTIONS
 
-HEADERS_DIR = /usr/src/linux-headers-$(UPSTREAM_VERSION)$(KPKG_ABINAME)$(LOCALVERSION)
+HEADERS_DIR = /usr/src/linux-headers-$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)
 
 include debian/rules.defs
 
@@ -22,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 *))
@@ -63,6 +59,8 @@
 	touch $@
 
 install-base:
+	dh_installchangelogs
+	dh_installdocs
 	dh_compress
 	dh_fixperms
 	dh_installdeb
@@ -70,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=$(HEADERS_DIR) 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 $(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: people/waldi/linux-nonfree-2.6/debian/templates/control.modules.in
==============================================================================
--- people/waldi/linux-nonfree-2.6/debian/templates/control.modules.in	(original)
+++ people/waldi/linux-nonfree-2.6/debian/templates/control.modules.in	Fri Mar  3 16:26:01 2006
@@ -1,4 +1,4 @@
-Package: linux-modules-nonfree- at version@- at abiname@@subarch 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@

More information about the Kernel-svn-changes mailing list