[Glibc-bsd-commits] r1511 - trunk/kfreebsd-6/debian
Robert Millan
rmh at costa.debian.org
Thu Apr 27 16:58:46 UTC 2006
Author: rmh
Date: 2006-04-27 16:58:45 +0000 (Thu, 27 Apr 2006)
New Revision: 1511
Removed:
trunk/kfreebsd-6/debian/kfreebsd-image.preinst.in
Modified:
trunk/kfreebsd-6/debian/changelog
trunk/kfreebsd-6/debian/control.flavor.in
trunk/kfreebsd-6/debian/kfreebsd-image.postinst.in
trunk/kfreebsd-6/debian/rules
Log:
Finaly, multiple kernels can coexist on your system\!
Modified: trunk/kfreebsd-6/debian/changelog
===================================================================
--- trunk/kfreebsd-6/debian/changelog 2006-04-27 15:33:36 UTC (rev 1510)
+++ trunk/kfreebsd-6/debian/changelog 2006-04-27 16:58:45 UTC (rev 1511)
@@ -1,14 +1,17 @@
kfreebsd-6 (6.0-0.3) UNRELEASED; urgency=low
- * Disable /boot/loader.conf (provided in kfreebsd-loader now).
+ * Finaly, multiple kernels can coexist on your system!
+ - Disable /boot/loader.conf (provided in kfreebsd-loader now).
+ - Get rid of /boot/device.hints (now embedded in kernel image).
+ - Move modules to /lib/modules/@RELEASE at .
+ - Move kernel image to /boot/kfreebsd- at RELEASE@.
* patches/999_config.diff: Refurbish. Now builds linprocfs/linux into
the kernel (since it's always used), and removes a bunch of non-
essential stuff (use kfreebsd-common to load them as modules).
Network and storage drivers _are_ still present (untill we port
hotplug/discover). On -486, this saves 544 KB in kernel.gz.
- * Get rid of /boot/device.hints (now embedded in kernel image).
- -- Robert Millan <rmh at aybabtu.com> Wed, 26 Apr 2006 22:21:26 +0200
+ -- Robert Millan <rmh at aybabtu.com> Thu, 27 Apr 2006 18:56:22 +0200
kfreebsd-6 (6.0-0.2) unreleased; urgency=low
Modified: trunk/kfreebsd-6/debian/control.flavor.in
===================================================================
--- trunk/kfreebsd-6/debian/control.flavor.in 2006-04-27 15:33:36 UTC (rev 1510)
+++ trunk/kfreebsd-6/debian/control.flavor.in 2006-04-27 16:58:45 UTC (rev 1511)
@@ -1,10 +1,8 @@
Package: kfreebsd-image- at version@- at abiname@- at flavor@
Architecture: kfreebsd- at arch@
Section: base
-Depends: freebsd-utils (>= 5), module-init-tools | kldutils, kfreebsd-common
+Depends: freebsd-utils (>= 5), module-init-tools | kldutils, kfreebsd-common (>= 0.2.2)
Provides: kfreebsd-image- at major@, kfreebsd-image
-Conflicts: kfreebsd5, kfreebsd-image
-Replaces: kfreebsd5
Recommends: @recommends@
Description: kernel of FreeBSD @version@ image
This package provides the binary image and pre-built loadable modules for
@@ -17,8 +15,6 @@
Section: contrib/net
Priority: optional
Depends: kfreebsd-image- at version@- at abiname@- at flavor@
-Provides: ndiswrapper-modules
-Conflicts: ndiswrapper-modules
Description: Ndiswrapper kFreeBSD module
This package contains the ndiswrapper loadable kernel modules for the
kfreebsd-image- at version@- at abiname@- at flavor@ package.
Modified: trunk/kfreebsd-6/debian/kfreebsd-image.postinst.in
===================================================================
--- trunk/kfreebsd-6/debian/kfreebsd-image.postinst.in 2006-04-27 15:33:36 UTC (rev 1510)
+++ trunk/kfreebsd-6/debian/kfreebsd-image.postinst.in 2006-04-27 16:58:45 UTC (rev 1511)
@@ -19,11 +19,28 @@
case "$1" in
configure)
- if diff -q /boot/kernel/kernel.gz{,.old} >/dev/null 2>/dev/null ; then
- rm -f /boot/kernel/kernel.gz.old
+ for i in kernel.gz acpi.ko ; do
+ if test -e /boot/kernel/$i && ! test -L /boot/kernel/$i ; then
+ echo "What happen!! /boot/kernel/$i exists but is not a symlink."
+ exit 1
+ fi
+ done
+
+ if [ "$(readlink -f /boot/kernel/kernel.gz)" != "/boot/kfreebsd- at RELEASE@.gz" ] ; then
+ rm -f /boot/kernel/kernel{,.gz}.old{,.gz}
+ if [ -L /boot/kernel/kernel.gz ] ; then
+ mv /boot/kernel/kernel{,.old}.gz
+ fi
+ ln -s /boot/kfreebsd- at RELEASE@.gz /boot/kernel/kernel.gz
fi
- if [ -e /etc/mtab ] ; then
- ln -sf /proc/mounts /etc/mtab
+
+ # acpi MUST be within kfreebsd-loader reach
+ if [ "$(readlink -f /boot/kernel/acpi.ko)" != "/lib/modules/@RELEASE@/acpi.ko" ] ; then
+ rm -f /boot/kernel/acpi.ko.old
+ if [ -L /boot/kernel/acpi.ko ] ; then
+ mv /boot/kernel/acpi.ko{,.old}
+ fi
+ ln -s /lib/modules/@RELEASE@/acpi.ko /boot/kernel/acpi.ko
fi
;;
Deleted: trunk/kfreebsd-6/debian/kfreebsd-image.preinst.in
===================================================================
--- trunk/kfreebsd-6/debian/kfreebsd-image.preinst.in 2006-04-27 15:33:36 UTC (rev 1510)
+++ trunk/kfreebsd-6/debian/kfreebsd-image.preinst.in 2006-04-27 16:58:45 UTC (rev 1511)
@@ -1,46 +0,0 @@
-#! /bin/bash
-# preinst script
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <new-preinst> `install'
-# * <new-preinst> `install' <old-version>
-# * <new-preinst> `upgrade' <old-version>
-# * <old-preinst> `abort-upgrade' <new-version>
-#
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
- install)
- ;;
- upgrade)
- if [ -f /boot/kernel/kernel ] ; then
- gzip -9 /boot/kernel/kernel
- fi
- if [ -f /boot/kernel/kernel.gz ] ; then
- mv /boot/kernel/kernel.gz{,.old}
- fi
- ;;
-
- abort-upgrade)
- ;;
-
- *)
- echo "preinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
Modified: trunk/kfreebsd-6/debian/rules
===================================================================
--- trunk/kfreebsd-6/debian/rules 2006-04-27 15:33:36 UTC (rev 1510)
+++ trunk/kfreebsd-6/debian/rules 2006-04-27 16:58:45 UTC (rev 1511)
@@ -2,6 +2,8 @@
# Sample debian/rules that uses debhelper.
# GNU copyright 1997 to 1999 by Joey Hess.
+SHELL = bash
+
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -49,7 +51,7 @@
dh_testdir
dh_testroot
rm -rf src kfreebsd-source-* flavor-* config
- rm -f debian/kfreebsd-image-*.{preinst,postinst}
+ rm -f debian/kfreebsd-image-*.postinst
rm -f *-stamp
dh_clean
@@ -110,8 +112,11 @@
cp -af src $(FLAVOR_DIR)-$*
# Add the abiname and the flavor to the kernel version
- sed -i -e 's/^RELEASE=".*"/RELEASE="$(version)-$(abiname)-$*"/g' $(FLAVOR_DIR)-$*/sys/conf/newvers.sh
+ sed -i -e 's/^RELEASE=".*"/RELEASE="$(version)-$(abiname)-$*"/g' $(FLAVOR_DIR)-$*/sys/conf/newvers.sh
+ # Set /lib/modules/${RELEASE} as module dir
+ sed -i -e 's,^KODIR?=.*,KODIR="/lib/modules/$(version)-$(abiname)-$*",g' $(FLAVOR_DIR)-$*/sys/conf/kern.pre.mk
+
# Configure the kernel
cp debian/arch/$(cpu)/*.config $(FLAVOR_DIR)-$*/sys/$(cpu)/conf/
ln -sf $*.config $(FLAVOR_DIR)-$*/sys/$(cpu)/conf/$(configfile)
@@ -138,8 +143,9 @@
install-flavor-%-stamp: install-common-stamp build-flavor-%-stamp
dh_testdir
dh_testroot
+ dh_clean -k -pkfreebsd-image-$(version)-$(abiname)-$*
- mkdir -p $(IMAGE_PACKAGE)-$*/boot/kernel
+ mkdir -p $(IMAGE_PACKAGE)-$*/{boot,lib/modules/$(version)-$(abiname)-$*}
# make the install target happy
install -o root -g root -m 644 \
@@ -155,8 +161,9 @@
# now install the kernel
$(MAKE) -C $(FLAVOR_DIR)-$*/sys/$(cpu)/compile/$(configfile) DESTDIR=$(IMAGE_PACKAGE)-$* install
- chmod 644 $(IMAGE_PACKAGE)-$*/boot/kernel/kernel
- gzip -9 $(IMAGE_PACKAGE)-$*/boot/kernel/kernel
+ mv $(IMAGE_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*/kernel $(IMAGE_PACKAGE)-$*/boot/kfreebsd-$(version)-$(abiname)-$*
+ chmod 644 $(IMAGE_PACKAGE)-$*/boot/kfreebsd-$(version)-$(abiname)-$*
+ gzip -9 $(IMAGE_PACKAGE)-$*/boot/kfreebsd-$(version)-$(abiname)-$*
# remove loader.conf (part of kfreebsd-loader)
rm -f $(IMAGE_PACKAGE)-$*/boot/loader.conf
@@ -172,15 +179,13 @@
$(IMAGE_PACKAGE)-$*/usr/share/lintian/overrides/kfreebsd-image-$(version)-$(abiname)-$*
# move ndis modules to their own package
- mkdir -p $(NDIS_PACKAGE)-$*/boot/kernel
- mv $(IMAGE_PACKAGE)-$*/boot/kernel/ndis.ko $(IMAGE_PACKAGE)-$*/boot/kernel/if_ndis.ko \
- $(NDIS_PACKAGE)-$*/boot/kernel/
+ mkdir -p $(NDIS_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*
+ mv $(IMAGE_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*/ndis.ko $(IMAGE_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*/if_ndis.ko \
+ $(NDIS_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*/
# scripts
- cp -f debian/kfreebsd-image.postinst.in \
- debian/kfreebsd-image-$(version)-$(abiname)-$*.postinst
- cp -f debian/kfreebsd-image.preinst.in \
- debian/kfreebsd-image-$(version)-$(abiname)-$*.preinst
+ sed -e "s/@RELEASE@/$(version)-$(abiname)-$*/g" debian/kfreebsd-image.postinst.in \
+ > debian/kfreebsd-image-$(version)-$(abiname)-$*.postinst
# headers package
mkdir -p $(HEADERS_PACKAGE)-$*/usr/src/$(HEADERS_DIR)-$*/sys/$(cpu)
@@ -221,12 +226,12 @@
dh_installdocs -s
dh_installchangelogs -s
dh_link -s
- dh_strip -s -X/boot
+ dh_strip -s -X/boot -X/lib/modules
dh_compress -s
dh_fixperms -s
dh_makeshlibs -s
dh_installdeb -s
- dh_shlibdeps -s -X/boot
+ dh_shlibdeps -s -X/boot -X/lib/modules
dh_gencontrol -s
dh_md5sums -s
dh_builddeb -s
More information about the Glibc-bsd-commits
mailing list