#include <hallo.h>
* Javier Kohen [Sun, May 29 2005, 09:59:27AM]:
> > There is no such package in Debian. Show me your source or send me your
> > binary package file (fglrx-kernel-src_...all.deb), otherwise I cannot
> > help you.
>
> You're right, I just noticed that the package added the fglrx-kernel-src
> definition for module-assistant. I thought it came in m-a's package, but
> it came from Flavio Stanchina's repository.
>
> However, the plex86-kernel-src definition, which does come with m-a,
> should have the same problem. Should I report a bug to
> fglrx-kernel-src's upstream to rename it to -kernel-source, or will the
> fix I posted in my other mail be added to fglrx? After all, this is a
> regression, as it used to work a few versions ago with the same version
> of the module.
I have sent a patch to him, basicaly adding an m-a control script to
overrides directory (attached) and suggesting to rename the tarball and
build dir, removing the -src suffix and using bzip2 in the future. No
reaction yet.
Regards,
Eduard.
--
<stockholm> Overfiend: why dont you flame him? you are good at that.
<Overfiend> I have too much else to do.
diff -Nurd orig/fglrx-installer-8.12.10/debian/changelog
fglrx-installer-8.12.10/debian/changelog
--- orig/fglrx-installer-8.12.10/debian/changelog 2005-04-09
17:57:06.000000000 +0200
+++ fglrx-installer-8.12.10/debian/changelog 2005-05-29 10:38:53.784262328
+0200
@@ -1,3 +1,30 @@
+fglrx-installer (8.12.10-2) experimental; urgency=low
+
+ * Added an "override" control script for module-assistant to pass the
+ tarball and builddir locations to work around this instance of "Yet
+ Another Funky Tarball/Builddir Name" syndrome (a workaround in m-a itself
+ will come soon but most likely not in Sarge, closes: #311090).
+ BITCHING: Much better solution: remove these "-src" suffixes everywhere
+ (except of the package name) and remove the override script then.
+ * removed --remove-files from the tar call because a) pointless, followed by
+ "rm -r modules" allready and b) caused strange failure on my system (Sid,
+ JFS)
+ * moved kernel-package from Depends to recommends in
+ control::fglrx-kernel-src (it does not require it, even documented in
+ README.Debian) and added module-assistant as alternative
+ * Removed the long collection of module-assistant calls with kernel-source
+ specs again and again.
+ BITCHING: It is called "assistant" because it assists. No
+ need to repeat stuff that can be detected (this even creates more trouble
+ with users because of typos). Also not needed to run "update" n times, it
+ updates as needed. But installing build-essential is needed, and maybe the
+ headers, so the recommendation to run "m-a prepare" should be there.
+ * BITCHING: I suggest compressing with bzip2 and naming it
fglrx-kernel.tar.bz2
+ * BITCHING: why the Nth recommendation of the builddir removal after
upgrade? If
+ it is so broken, then remove it in postinst
+
+ -- Eduard Bloch <[EMAIL PROTECTED]> Sun, 29 May 2005 09:12:23 +0200
+
fglrx-installer (8.12.10-1) experimental; urgency=low
* New upstream version. Thanks to Alexandru for the patch.
diff -Nurd orig/fglrx-installer-8.12.10/debian/control
fglrx-installer-8.12.10/debian/control
--- orig/fglrx-installer-8.12.10/debian/control 2005-04-09 17:48:10.000000000
+0200
+++ fglrx-installer-8.12.10/debian/control 2005-05-29 10:04:22.867089592
+0200
@@ -39,7 +39,8 @@
Package: fglrx-kernel-src
Architecture: amd64 i386
-Depends: debconf, debhelper (>= 4), kernel-package, make
+Depends: debconf, debhelper (>= 4) make
+Recommends: module-assistant | kernel-package
Suggests: fglrx-driver
Description: Kernel module source for the ATI graphics accelerators
Video driver for the ATI Radeon and FireGL graphics accelerators.
diff -Nurd orig/fglrx-installer-8.12.10/debian/fglrx-kernel-src.m-a
fglrx-installer-8.12.10/debian/fglrx-kernel-src.m-a
--- orig/fglrx-installer-8.12.10/debian/fglrx-kernel-src.m-a 1970-01-01
01:00:00.000000000 +0100
+++ fglrx-installer-8.12.10/debian/fglrx-kernel-src.m-a 2005-05-29
10:17:30.481354024 +0200
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# (c) Eduard Bloch <[EMAIL PROTECTED]>, 2003
+# modified default.sh script to get the unpacking right with Sarge's
+# modules-assistant
+
+MA_DIR=${MA_DIR:-/usr/share/modass}
+
+TARBALL=/usr/src/fglrx-kernel-src.tar.gz
+MODULE_LOC=${MODULE_LOC:-/usr/src/modules}
+BUILDDIR="$MODULE_LOC/fglrx-kernel-src"
+
+. $MA_DIR/packages/generic.sh
+
+$1 "$@"
diff -Nurd orig/fglrx-installer-8.12.10/debian/README.Debian
fglrx-installer-8.12.10/debian/README.Debian
--- orig/fglrx-installer-8.12.10/debian/README.Debian 2005-03-27
15:33:04.000000000 +0200
+++ fglrx-installer-8.12.10/debian/README.Debian 2005-05-29
10:20:25.085810112 +0200
@@ -35,6 +35,7 @@
Building the kernel module
--------------------------
+
You can build the kernel module in several ways:
1) Use the supplied make.sh script. This will build a module that matches
the running kernel; you need to have the correct kernel source and
@@ -50,16 +51,19 @@
the Debian kernel-image package that you are using. This is "the Debian
way". See the "modules_image" section of the make-kpkg(1) man page.
-4) Use module-assistant. For example:
- # module-assistant -k /usr/src/linux update
- # module-assistant -k /usr/src/linux build fglrx-kernel
- # module-assistant -k /usr/src/linux install fglrx-kernel
+4) Use module-assistant. In the usual environment it should detect all
+ requirements. Example (assuming that you build for the running kernel):
- If you prefer to build the packages with m-a from your own user account:
- $ mkdir ~/src/modass
- $ module-assistant -u ~/src/modass -k ~/src/linux update
- $ module-assistant -u ~/src/modass -k ~/src/linux build fglrx-kernel
- $ module-assistant -u ~/src/modass -k ~/src/linux install fglrx-kernel
+ # module-assistant a-i fglrx
+
+ If you have never build modules before, you should prepare the build
+ environment by running:
+ # m-a prepare
+
+ If you prefer to build the packages with m-a from your own user account
+ (with ~/src/linux beeing the kernel source):
+ $ mkdir -p ~/src/modass
+ $ module-assistant -u ~/src/modass -k ~/src/linux install fglrx-kernel-src
Options 3) and 4) will create a nice Debian package to install;
otherwise, you'll have to copy the module to the right directory under
diff -Nurd orig/fglrx-installer-8.12.10/debian/rules
fglrx-installer-8.12.10/debian/rules
--- orig/fglrx-installer-8.12.10/debian/rules 2005-04-09 17:58:24.000000000
+0200
+++ fglrx-installer-8.12.10/debian/rules 2005-05-29 10:13:04.689760488
+0200
@@ -63,6 +63,7 @@
#BASEURL := http://www2.ati.com/drivers/firegl/
BASEURL := http://www2.ati.com/drivers/linux/
KSRCDIR := usr/src/modules/fglrx-kernel-src
+KSRCMAOVER := usr/share/modass/overrides
# These file names don't always match XVERSION+PVERSION:
# look on the driver info page and update accordingly.
@@ -150,7 +151,7 @@
usr/X11R6/lib \
usr/include
dh_installdirs -p$(PKG_kernel_src) \
- $(KSRCDIR) \
+ $(KSRCMAOVER) \
$(KSRCDIR)/debian
dh_installdirs -A -p$(PKG_control_qt3) \
usr/X11R6 \
@@ -217,8 +218,9 @@
(cd debian/$(PKG_kernel_src)/$(KSRCDIR); for file in
$(CURDIR)/$(PATCHDIR)/[0-9]*-*; do patch -i $$file -p0 --no-backup-if-mismatch;
done)
(cd debian/$(PKG_kernel_src)/usr/src \
&& chown -R root:src modules \
- && tar czf $(PKG_kernel_src).tar.gz modules --remove-files \
- && rm -r modules)
+ && tar czf $(PKG_kernel_src).tar.gz modules \
+ && rm -rf modules)
+ install -m755 debian/fglrx-kernel-src.m-a
debian/$(PKG_kernel_src)/$(KSRCMAOVER)/fglrx-kernel-src
# install panel files
make -C extra_src/panel QTDIR=/usr/share/qt3
DESTDIR=$(CURDIR)/debian/$(PKG_control_qt3) install
Binärdateien orig/fglrx-installer-8.12.10/fglrx_4_3_0-8.12.10-1.i386.rpm and
fglrx-installer-8.12.10/fglrx_4_3_0-8.12.10-1.i386.rpm sind verschieden.
#!/bin/sh
#
# (c) Eduard Bloch <[EMAIL PROTECTED]>, 2003
# modified default.sh script to get the unpacking right with Sarge's
# modules-assistant
MA_DIR=${MA_DIR:-/usr/share/modass}
TARBALL=/usr/src/fglrx-kernel-src.tar.gz
MODULE_LOC=${MODULE_LOC:-/usr/src/modules}
BUILDDIR="$MODULE_LOC/fglrx-kernel-src"
. $MA_DIR/packages/generic.sh
$1 "$@"
