[Pkg-fglrx-devel] r977 - in fglrx-driver/trunk/debian: . module
Andreas Beckmann
anbe-guest at alioth.debian.org
Mon Jul 9 23:13:02 UTC 2012
Author: anbe-guest
Date: 2012-07-09 23:13:02 +0000 (Mon, 09 Jul 2012)
New Revision: 977
Added:
fglrx-driver/trunk/debian/build-module-packages.sh.in
fglrx-driver/trunk/debian/module/bug-control.in
fglrx-driver/trunk/debian/module/rules.in
Removed:
fglrx-driver/trunk/debian/build-module-packages.sh
fglrx-driver/trunk/debian/module/bug-control
fglrx-driver/trunk/debian/module/rules
Modified:
fglrx-driver/trunk/debian/rules
Log:
need to customize the package names at more places
Deleted: fglrx-driver/trunk/debian/build-module-packages.sh
===================================================================
--- fglrx-driver/trunk/debian/build-module-packages.sh 2012-07-09 21:20:15 UTC (rev 976)
+++ fglrx-driver/trunk/debian/build-module-packages.sh 2012-07-09 23:13:02 UTC (rev 977)
@@ -1,19 +0,0 @@
-set -e
-
-test -x /usr/bin/module-assistant || apt-get install module-assistant
-
-cd /usr/src
-
-kernels="$(ls -d1 linux-headers* | grep -v common | sed -e s/linux-headers-//)"
-modules="$(ls -d1 fglrx.tar.bz2 | sed -e s/.tar.bz2// -e '/-kernel/! s/$/-kernel/')"
-
-module-assistant clean $modules
-module-assistant build --text-mode --force --kvers-list "$kernels" $modules
-
-ls -l *.deb
-for m in $modules ; do
- for k in $kernels ; do
- echo "* ${m}-${k}:"
- ls -l ${m}-${k}_*.deb
- done
-done
Copied: fglrx-driver/trunk/debian/build-module-packages.sh.in (from rev 976, fglrx-driver/trunk/debian/build-module-packages.sh)
===================================================================
--- fglrx-driver/trunk/debian/build-module-packages.sh.in (rev 0)
+++ fglrx-driver/trunk/debian/build-module-packages.sh.in 2012-07-09 23:13:02 UTC (rev 977)
@@ -0,0 +1,19 @@
+set -e
+
+test -x /usr/bin/module-assistant || apt-get install module-assistant
+
+cd /usr/src
+
+kernels="$(ls -d1 /lib/modules/*/build 2>/dev/null | cut -d/ -f4)"
+modules=_FGLRX_
+
+module-assistant clean $modules
+module-assistant build --text-mode --force --kvers-list "$kernels" $modules
+
+ls -l *.deb
+for m in $modules ; do
+ for k in $kernels ; do
+ echo "* ${m} ${k}:"
+ ls -l ${m}-kernel-${k}_*.deb
+ done
+done
Deleted: fglrx-driver/trunk/debian/module/bug-control
===================================================================
--- fglrx-driver/trunk/debian/module/bug-control 2012-07-09 21:20:15 UTC (rev 976)
+++ fglrx-driver/trunk/debian/module/bug-control 2012-07-09 23:13:02 UTC (rev 977)
@@ -1 +0,0 @@
-Submit-As: fglrx-source
Copied: fglrx-driver/trunk/debian/module/bug-control.in (from rev 976, fglrx-driver/trunk/debian/module/bug-control)
===================================================================
--- fglrx-driver/trunk/debian/module/bug-control.in (rev 0)
+++ fglrx-driver/trunk/debian/module/bug-control.in 2012-07-09 23:13:02 UTC (rev 977)
@@ -0,0 +1 @@
+Submit-As: _FGLRX_-source
Deleted: fglrx-driver/trunk/debian/module/rules
===================================================================
--- fglrx-driver/trunk/debian/module/rules 2012-07-09 21:20:15 UTC (rev 976)
+++ fglrx-driver/trunk/debian/module/rules 2012-07-09 23:13:02 UTC (rev 977)
@@ -1,117 +0,0 @@
-#!/usr/bin/make -f
-# Copyright (C) 2002-2006 Flavio Stanchina
-# Licensed under the GNU General Public License, version 2.
-# Adapted from nvidia-kernel-src.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-export CCACHE_DISABLE := 1
-
-
-upstream_version := $(shell dpkg-parsechangelog | sed -nr '/^Version:/s/Version: (.*:)?(.*)-(.*)/\2/p')
-
-baseepoch := $(shell expr $(KDREV) : '\([0-9]*\):.*' 2>/dev/null )
-ifneq ($(baseepoch),)
- EPOCH=$(baseepoch):
-endif
-REV := $(shell expr $(KDREV) : '[0-9]*:\(.*\)' 2>/dev/null)
-ifeq ($(REV),)
- REV=$(KDREV)
-endif
-VERSION := $(shell dpkg-parsechangelog | grep '^Version:' | cut -d' ' -f2)
-ifeq ($(REV),)
-PKG_VERSION=$(EPOCH)$(VERSION)
-else
-PKG_VERSION=$(EPOCH)$(VERSION)+$(REV)
-endif
-
-# determine fglrx-source package version and warn user if it doesn't match
-SRC_PKG_VERSION := $(shell dpkg -s fglrx-source | grep '^Version:' | cut -d' ' -f2)
-ifneq ($(SRC_PKG_VERSION),$(VERSION))
-$(warning *** the unpacked source ($(VERSION)) doesn't match the fglrx-source package ($(SRC_PKG_VERSION)))
-$(warning *** if this is not what you want, erase $(CURDIR) and start over)
-endif
-
-# if you need to redefine these
-KSRC := $(KSRC)
-KVERS := ${KVERS}
-
-module=fglrx.ko
-
-CHANGES_FILE=$(KPKG_DEST_DIR)/fglrx-kernel-$(KVERS)_$(PKG_VERSION)_$(ARCH).changes
-
-configure: configure-stamp
-
-configure-stamp:
- sed -e 's/#KVERS#/$(KVERS)/g' \
- -e 's/#VERSION#/$(VERSION)/g' debian/control.template > debian/control
- sed 's/#KVERS#/$(KVERS)/g' debian/install.template > debian/install
- touch $@
-
-build: configure-stamp
- dh_testdir
- dh_prep
- $(MAKE) -C $(KSRC) SUBDIRS=$(CURDIR) modules
-
-binary_modules: build
- dh_testdir
- dh_testroot
- dh_installdirs
- dh_install
- dh_installdocs
- dh_installchangelogs
- dh_installmodules
- dh_bugfiles
- dh_lintian
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol -- -v$(PKG_VERSION) -V'fglrx:Version=$(subst ~,-,$(upstream_version))'
- dh_md5sums
-ifdef KPKG_DEST_DIR
- dh_builddeb --destdir=$(KPKG_DEST_DIR)
-else
- dh_builddeb --destdir=$(CURDIR)/../..
-endif
-
-clean:
- test -f debian/control || cp debian/control.template debian/control
- dh_testroot
- rm -f configure-stamp
- rm -f $(module) fglrx.mod.c *.o
- rm -f .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd
- rm -rf .tmp_versions
- rm -rf patch
- dh_clean debian/control debian/install
-
-# The kdist_configure target is called by make-kpkg modules_config. It
-# should configure the module so it is ready for compilation (mostly
-# useful for calling configure)
-kdist_config: configure
-
-kdist_configure: configure
-
-
-# the kdist_image target is called by make-kpkg modules_image. It is
-# responsible for compiling the module and creating the package. It
-# should also clean up after making the module. Please note we use a
-# separate binary_modules target to make testing the package building
-# easier
-kdist_image:
- $(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules binary_modules
-
-
-# the kdist_clean target is called by make-kpkg modules_clean. It is
-# responsible for cleaning up any changes that have been made by the
-# other kdist_commands (except for the .deb files created).
-kdist_clean:
- $(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules clean
-
-kdist: kdist_clean kdist_image
- dpkg-genchanges -b -u$(KPKG_DEST_DIR) > $(CHANGES_FILE)
- -debsign -m"$(KMAINT)" $(CHANGES_FILE)
-
-.PHONY: configure build install binary_modules clean kdist_config kdist_configure kdist_image kdist_clean kdist
Copied: fglrx-driver/trunk/debian/module/rules.in (from rev 976, fglrx-driver/trunk/debian/module/rules)
===================================================================
--- fglrx-driver/trunk/debian/module/rules.in (rev 0)
+++ fglrx-driver/trunk/debian/module/rules.in 2012-07-09 23:13:02 UTC (rev 977)
@@ -0,0 +1,117 @@
+#!/usr/bin/make -f
+# Copyright (C) 2002-2006 Flavio Stanchina
+# Licensed under the GNU General Public License, version 2.
+# Adapted from nvidia-kernel-src.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+export CCACHE_DISABLE := 1
+
+
+upstream_version := $(shell dpkg-parsechangelog | sed -nr '/^Version:/s/Version: (.*:)?(.*)-(.*)/\2/p')
+
+baseepoch := $(shell expr $(KDREV) : '\([0-9]*\):.*' 2>/dev/null )
+ifneq ($(baseepoch),)
+ EPOCH=$(baseepoch):
+endif
+REV := $(shell expr $(KDREV) : '[0-9]*:\(.*\)' 2>/dev/null)
+ifeq ($(REV),)
+ REV=$(KDREV)
+endif
+VERSION := $(shell dpkg-parsechangelog | grep '^Version:' | cut -d' ' -f2)
+ifeq ($(REV),)
+PKG_VERSION=$(EPOCH)$(VERSION)
+else
+PKG_VERSION=$(EPOCH)$(VERSION)+$(REV)
+endif
+
+# determine _FGLRX_-source package version and warn user if it doesn't match
+SRC_PKG_VERSION := $(shell dpkg-query -s _FGLRX_-source | grep '^Version:' | cut -d' ' -f2)
+ifneq ($(SRC_PKG_VERSION),$(VERSION))
+$(warning *** the unpacked source ($(VERSION)) doesn't match the _FGLRX_-source package ($(SRC_PKG_VERSION)))
+$(warning *** if this is not what you want, erase $(CURDIR) and start over)
+endif
+
+# if you need to redefine these
+KSRC := $(KSRC)
+KVERS := ${KVERS}
+
+module=fglrx.ko
+
+CHANGES_FILE=$(KPKG_DEST_DIR)/_FGLRX_-kernel-$(KVERS)_$(PKG_VERSION)_$(ARCH).changes
+
+configure: configure-stamp
+
+configure-stamp:
+ sed -e 's/#KVERS#/$(KVERS)/g' \
+ -e 's/#VERSION#/$(VERSION)/g' debian/control.template > debian/control
+ sed 's/#KVERS#/$(KVERS)/g' debian/install.template > debian/install
+ touch $@
+
+build: configure-stamp
+ dh_testdir
+ dh_prep
+ $(MAKE) -C $(KSRC) SUBDIRS=$(CURDIR) modules
+
+binary_modules: build
+ dh_testdir
+ dh_testroot
+ dh_installdirs
+ dh_install
+ dh_installdocs
+ dh_installchangelogs
+ dh_installmodules
+ dh_bugfiles
+ dh_lintian
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_gencontrol -- -v$(PKG_VERSION) -V'fglrx:Version=$(subst ~,-,$(upstream_version))'
+ dh_md5sums
+ifdef KPKG_DEST_DIR
+ dh_builddeb --destdir=$(KPKG_DEST_DIR)
+else
+ dh_builddeb --destdir=$(CURDIR)/../..
+endif
+
+clean:
+ test -f debian/control || cp debian/control.template debian/control
+ dh_testroot
+ rm -f configure-stamp
+ rm -f $(module) fglrx.mod.c *.o
+ rm -f .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd
+ rm -rf .tmp_versions
+ rm -rf patch
+ dh_clean debian/control debian/install
+
+# The kdist_configure target is called by make-kpkg modules_config. It
+# should configure the module so it is ready for compilation (mostly
+# useful for calling configure)
+kdist_config: configure
+
+kdist_configure: configure
+
+
+# the kdist_image target is called by make-kpkg modules_image. It is
+# responsible for compiling the module and creating the package. It
+# should also clean up after making the module. Please note we use a
+# separate binary_modules target to make testing the package building
+# easier
+kdist_image:
+ $(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules binary_modules
+
+
+# the kdist_clean target is called by make-kpkg modules_clean. It is
+# responsible for cleaning up any changes that have been made by the
+# other kdist_commands (except for the .deb files created).
+kdist_clean:
+ $(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules clean
+
+kdist: kdist_clean kdist_image
+ dpkg-genchanges -b -u$(KPKG_DEST_DIR) > $(CHANGES_FILE)
+ -debsign -m"$(KMAINT)" $(CHANGES_FILE)
+
+.PHONY: configure build install binary_modules clean kdist_config kdist_configure kdist_image kdist_clean kdist
Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules 2012-07-09 21:20:15 UTC (rev 976)
+++ fglrx-driver/trunk/debian/rules 2012-07-09 23:13:02 UTC (rev 977)
@@ -48,7 +48,7 @@
AUTOKEEP =
AUTOCLEAN = $(filter-out $(AUTOKEEP),$(AUTOGEN))
-%: %.in debian/rules debian/rules.defs
+%:: %.in debian/rules debian/rules.defs
sed -r -e 's%_VERSION_%$(upstream_version)%g' \
-e 's%_FGLRX_%$(fglrx)%g' \
-e 's%_VARIANT_%$(variant)%g' \
More information about the Pkg-fglrx-devel
mailing list