Hello,
I attach here a draft of the smallish patch to enable the building of
the driver SDK. The patch only patches the debian directory, and no
upstream patch is needed anymore, since the 000_post430.diff patch
already includes them.
For the rest, i have created a xfree86-driver-sdk package with the
following description :
Package: xfree86-driver-sdk
Architecture: any
Depends: xlibs-dev
Description: XFree86 driver development kit.
The XFree86 driver SDK (DDK would have been a better name) contain everything
that is needed to rebuild the video drivers. It can be used either to apply
some patch to the driver and rebuild them or to build the drivers from the
xfree86 CVS HEAD or from other third party sources.
This package contains only one file /usr/src/xfree86-sdk.tar.bz2. Adding the
XFree86 version number in this package would be a good thing, maybe. It
will contains a still empty README.Debian file too, which will contain
instructions on how to use the SDK.
To build it, i have simply added the install.sdk call which populates
$(DEBTREEDIR)/usr/X11R6/lib/Server and then later made a bzip2 tarball
of the Server directory.
This builds fine, but naturally fails at MANIFEST build time, and here i
am not sure how to best handle this thing.
Should i erase the $(DEBTREEDIR)/usr/X11R6/lib/Server directory after
having built the tarball, and only list the tarball in the manifest, or
list all these files in the manifest, and move the tarball creation call
into binary-arch target. The first option will allow for adding only one
file in the manifest, but will not test for the creation of the content
of the tarball, while the second will add lot of stuff in the manifest,
but test for the existence of all the files.
I am not sure if all the files included here are already checked or not
in the MANIFEST when installing the normal target.
Anyway, i append the (x86) MANIFEST diff too, containing the files
actually going in the tarball.
Branden, advice on making these choices best would be welcome, and by
tomorrow night, you should have a full SDK building patch, and i can
start working on the actual package using it, which would need maybe
further upstream patching, both in the 4.3.0 bugfix branch and in the
HEAD branch to be able to build the CVS HEAD drivers with this SDK.
Friendly,
Sven Luther
diff -urN debian.orig/control debian/control
--- debian.orig/control 2003-10-31 13:33:23.000000000 +0100
+++ debian/control 2003-10-31 13:25:43.000000000 +0100
@@ -1195,3 +1195,13 @@
This package smooths upgrades from Debian 3.0 by depending on
xlibs-static-pic. This pseudopackage is only depended upon by packages that
haven't yet corrected their dependencies to reflect the new package name.
+
+Package: xfree86-driver-sdk
+Architecture: any
+Depends: xlibs-dev
+Description: XFree86 driver development kit.
+ The XFree86 driver SDK (DDK would have been a better name) contain everything
+ that is needed to rebuild the video drivers. It can be used either to apply
+ some patch to the driver and rebuild them or to build the drivers from the
+ xfree86 CVS HEAD or from other third party sources.
+
diff -urN debian.orig/rules debian/rules
--- debian.orig/rules 2003-10-31 13:33:22.000000000 +0100
+++ debian/rules 2003-10-31 13:26:00.000000000 +0100
@@ -244,7 +244,7 @@
ifndef test_rules
umask 022
dh_clean -k
- $(MAKE) -C $(SOURCE_TREE) SHELL="/bin/sh -e" DESTDIR=$(DEBTREEDIR) install
install.man
+ $(MAKE) -C $(SOURCE_TREE) SHELL="/bin/sh -e" DESTDIR=$(DEBTREEDIR) install
install.man install.sdk
# install Debian's font tools
install -m 755 -d $(DEBTREEDIR)/usr/bin $(DEBTREEDIR)/usr/sbin
install -m 755 -d $(DEBTREEDIR)/usr/share/man/man1
$(DEBTREEDIR)/usr/share/man/man5 $(DEBTREEDIR)/usr/share/man/man8
@@ -316,6 +316,8 @@
install -m 644 debian/local/xfs.options.5 $(DEBTREEDIR)/usr/share/man/man5
install -m 755 debian/local/xvfb-run $(DEBTREEDIR)/usr/bin
install -m 644 debian/local/xvfb-run.1 $(DEBTREEDIR)/usr/share/man/man1
+ # build the SDK tarball
+ tar -C $(DEBTREEDIR)/usr/X11R6/lib -c -j Server -f
$(DEBTREEDIR)/usr/src/xfree86-sdk.tar.bz2
# compare manifests
(cd debian/tmp && find -type f | LC_ALL=C sort | cut -c3-) >
debian/MANIFEST.$(ARCH).new
# confirm that the installed file list has not changed
@@ -407,7 +409,8 @@
-Nxlibmesa-glu-dbg \
-Nxlibosmesa4-dbg \
-Nxlibs-dbg \
- -Nxserver-xfree86-dbg
+ -Nxserver-xfree86-dbg \
+ -Nxfree86-driver-sdk
find debian/xserver-xfree86/usr/X11R6/lib/modules -name "*.o" | \
xargs --no-run-if-empty \
strip --strip-debug --remove-section=.note --remove-section=.comment
@@ -422,7 +425,7 @@
chown :utmp debian/xterm/usr/X11R6/bin/xterm
chmod g+s debian/xterm/usr/X11R6/bin/xterm
dh_installdeb
- dh_shlibdeps -l$(DEBTREEDIR)/usr/lib -l$(DEBTREEDIR)/usr/X11R6/lib -Nxlibs
--exclude=usr/X11R6/lib/modules
+ dh_shlibdeps -l$(DEBTREEDIR)/usr/lib -l$(DEBTREEDIR)/usr/X11R6/lib -Nxlibs
-Nxfree86-driver-sdk --exclude=usr/X11R6/lib/modules
# xlibs needs to be given a special shlibs file so that dpkg-shlibdeps
# doesn't try to make it depend on itself
DH_OPTIONS= dh_shlibdeps -l$(DEBTREEDIR)/usr/X11R6/lib -pxlibs
--exclude=libxrx.so -- -Ldebian/xlibs.shlibs.dummy
diff -urN debian.orig/xfree86-driver-sdk.install debian/xfree86-driver-sdk.install
--- debian.orig/xfree86-driver-sdk.install 1970-01-01 01:00:00.000000000 +0100
+++ debian/xfree86-driver-sdk.install 2003-10-31 13:32:56.000000000 +0100
@@ -0,0 +1 @@
+usr/src/xfree86-sdk.tar.bz2
diff -urN debian.orig/xfree86-driver-sdk.README.Debian
debian/xfree86-driver-sdk.README.Debian
--- debian.orig/xfree86-driver-sdk.README.Debian 1970-01-01 01:00:00.000000000
+0100
+++ debian/xfree86-driver-sdk.README.Debian 2003-10-31 13:09:37.000000000 +0100
@@ -0,0 +1,3 @@
+Debian README for xfree86-driver-sdk package
+
+Sven Luther, 09 Aug 2003
