[Pkg-fglrx-devel] r737 - fglrx-driver/branches/merge-mu-src/debian
Andreas Beckmann
anbe-guest at alioth.debian.org
Thu Aug 18 09:21:16 UTC 2011
Author: anbe-guest
Date: 2011-08-18 09:21:16 +0000 (Thu, 18 Aug 2011)
New Revision: 737
Added:
fglrx-driver/branches/merge-mu-src/debian/build-module-packages.sh
fglrx-driver/branches/merge-mu-src/debian/fglrx-source.docs
fglrx-driver/branches/merge-mu-src/debian/fglrx-source.install.in
fglrx-driver/branches/merge-mu-src/debian/fglrx-source.lintian-overrides
fglrx-driver/branches/merge-mu-src/debian/module/
Modified:
fglrx-driver/branches/merge-mu-src/debian/changelog
fglrx-driver/branches/merge-mu-src/debian/control
fglrx-driver/branches/merge-mu-src/debian/rules
Log:
merge the resurrect-fglrx-source branch
Copied: fglrx-driver/branches/merge-mu-src/debian/build-module-packages.sh (from rev 736, fglrx-driver/branches/resurrect-fglrx-source/debian/build-module-packages.sh)
===================================================================
--- fglrx-driver/branches/merge-mu-src/debian/build-module-packages.sh (rev 0)
+++ fglrx-driver/branches/merge-mu-src/debian/build-module-packages.sh 2011-08-18 09:21:16 UTC (rev 737)
@@ -0,0 +1,19 @@
+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
Modified: fglrx-driver/branches/merge-mu-src/debian/changelog
===================================================================
--- fglrx-driver/branches/merge-mu-src/debian/changelog 2011-08-18 09:12:31 UTC (rev 736)
+++ fglrx-driver/branches/merge-mu-src/debian/changelog 2011-08-18 09:21:16 UTC (rev 737)
@@ -1,4 +1,4 @@
-fglrx-driver (1:11-8-2) UNRELEASED; urgency=low
+fglrx-driver (1:11-8-2m) UNRELEASED; urgency=low
[ Andreas Beckmann ]
* Include libfglrx_ip.a for both architectures in the module source.
@@ -28,6 +28,10 @@
* Add instructions for squeeze-backports to README.source and a
prepare-squeeze-backport target to debian/rules that performs the
necessary changes.
+ * Resurrect the fglrx-source package.
+ * Add alternate recomends fglrx-kernel-${fglrx:version} to fglrx-driver,
+ this virtual package is provided by the dkms package and the module
+ packages built from fglrx-source.
-- Andreas Beckmann <debian at abeckmann.de> Thu, 18 Aug 2011 09:46:11 +0200
Modified: fglrx-driver/branches/merge-mu-src/debian/control
===================================================================
--- fglrx-driver/branches/merge-mu-src/debian/control 2011-08-18 09:12:31 UTC (rev 736)
+++ fglrx-driver/branches/merge-mu-src/debian/control 2011-08-18 09:21:16 UTC (rev 737)
@@ -35,7 +35,7 @@
xorg-video-abi-10 | xorg-video-abi-8 | xorg-video-abi-6.0,
glx-alternative-fglrx (>= 0.1.2)
Recommends:
- fglrx-modules-dkms (= ${binary:Version}),
+ fglrx-modules-dkms (= ${binary:Version}) | fglrx-kernel-${fglrx:version},
libgl1-fglrx-glx (= ${binary:Version}),
fglrx-glx-ia32 [amd64],
fglrx-atieventsd
@@ -184,6 +184,18 @@
This driver is not free. As an alternative, you may try the newest free
driver xserver-xorg-video-radeon.
+Package: fglrx-source
+Section: non-free/kernel
+Architecture: i386 amd64
+Depends: ${misc:Depends}, debhelper (>= 8), make, bzip2
+Recommends: module-assistant | kernel-package
+Suggests: fglrx-driver
+Conflicts: fglrx-kernel-src
+Description: kernel module source for the non-free ATI/AMD RadeonHD display driver
+ This package provides the kernel build environment and the fglrx modules,
+ which are necessary to have accelerated 3D support within the ATI/AMD
+ proprietary display driver.
+
Package: fglrx-modules-dkms
Section: non-free/kernel
Architecture: i386 amd64
@@ -191,6 +203,7 @@
${misc:Depends},
dkms
Suggests: fglrx-driver
+Provides: fglrx-kernel-${fglrx:version}
Description: dkms module source for the non-free ATI/AMD RadeonHD display driver
This package provides the kernel build environment and the fglrx modules,
which are necessary to have accelerated 3D support within the ATI/AMD
Copied: fglrx-driver/branches/merge-mu-src/debian/fglrx-source.docs (from rev 736, fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-source.docs)
===================================================================
--- fglrx-driver/branches/merge-mu-src/debian/fglrx-source.docs (rev 0)
+++ fglrx-driver/branches/merge-mu-src/debian/fglrx-source.docs 2011-08-18 09:21:16 UTC (rev 737)
@@ -0,0 +1 @@
+debian/build-module-packages.sh
Copied: fglrx-driver/branches/merge-mu-src/debian/fglrx-source.install.in (from rev 736, fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-source.install.in)
===================================================================
--- fglrx-driver/branches/merge-mu-src/debian/fglrx-source.install.in (rev 0)
+++ fglrx-driver/branches/merge-mu-src/debian/fglrx-source.install.in 2011-08-18 09:21:16 UTC (rev 737)
@@ -0,0 +1,10 @@
+common/lib/modules/fglrx/build_mod/*.c usr/src/modules/fglrx/
+common/lib/modules/fglrx/build_mod/*.h usr/src/modules/fglrx/
+common/lib/modules/fglrx/build_mod/2.6.x/Makefile usr/src/modules/fglrx/
+arch/x86/lib/modules/fglrx/build_mod/libfglrx_ip.a usr/src/modules/fglrx/x86/
+arch/x86_64/lib/modules/fglrx/build_mod/libfglrx_ip.a usr/src/modules/fglrx/x86_64/
+debian/changelog usr/src/modules/fglrx/debian/
+debian/copyright usr/src/modules/fglrx/debian/
+debian/compat usr/src/modules/fglrx/debian/
+debian/module/* usr/src/modules/fglrx/debian/
+debian/bug-script usr/src/modules/fglrx/debian/
Copied: fglrx-driver/branches/merge-mu-src/debian/fglrx-source.lintian-overrides (from rev 736, fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-source.lintian-overrides)
===================================================================
--- fglrx-driver/branches/merge-mu-src/debian/fglrx-source.lintian-overrides (rev 0)
+++ fglrx-driver/branches/merge-mu-src/debian/fglrx-source.lintian-overrides 2011-08-18 09:21:16 UTC (rev 737)
@@ -0,0 +1 @@
+fglrx-source: no-upstream-changelog
Modified: fglrx-driver/branches/merge-mu-src/debian/rules
===================================================================
--- fglrx-driver/branches/merge-mu-src/debian/rules 2011-08-18 09:12:31 UTC (rev 736)
+++ fglrx-driver/branches/merge-mu-src/debian/rules 2011-08-18 09:21:16 UTC (rev 737)
@@ -60,6 +60,10 @@
override_dh_install:
dh_install
chrpath -d -k debian/fglrx-control/usr/bin/amdcccle
+ chmod a+x debian/fglrx-source/usr/src/modules/fglrx/debian/rules
+ tar cfj debian/fglrx-source/usr/src/fglrx.tar.bz2 \
+ --owner=root --group=src --remove-files \
+ --directory debian/fglrx-source/usr/src/ modules
# Install reportbug files in all binary packages
override_dh_bugfiles:
@@ -77,7 +81,8 @@
# temporary, hardcode the version in debian/control once this branch gets merged into trunk
override_dh_gencontrol:
- dh_gencontrol -- -V'fglrx:multiarch=1:11-8-2'
+ dh_gencontrol -- -V'fglrx:version=$(upstream_version)' \
+ -V'fglrx:multiarch=1:11-8-2'
############################################################################
More information about the Pkg-fglrx-devel
mailing list