[Glibc-bsd-commits] r5098 - trunk/kfreebsd-11/debian

[Robert Millan]

Author: rmh
Date: 2013-10-26 18:10:21 +0000 (Sat, 26 Oct 2013)
New Revision: 5098

Modified:
   trunk/kfreebsd-11/debian/changelog
   trunk/kfreebsd-11/debian/control.in
   trunk/kfreebsd-11/debian/rules
Log:
Move modules to /boot/modules, as discussed in https://lists.debian.org/debian-bsd/2013/09/msg00003.html

Modified: trunk/kfreebsd-11/debian/changelog
===================================================================
--- trunk/kfreebsd-11/debian/changelog	2013-10-26 15:48:41 UTC (rev 5097)
+++ trunk/kfreebsd-11/debian/changelog	2013-10-26 18:10:21 UTC (rev 5098)
@@ -3,6 +3,8 @@
   [ Robert Millan ]
   * Remove (disabled) patch 006_mips_i8259_alloc.diff. Problem has been
     fixed in upstream already.
+  * Move modules to /boot/modules, as discussed in
+    https://lists.debian.org/debian-bsd/2013/09/msg00003.html
 
   [ Guillem Jover ]
   * Remove myself from Uploaders.

Modified: trunk/kfreebsd-11/debian/control.in
===================================================================
--- trunk/kfreebsd-11/debian/control.in	2013-10-26 15:48:41 UTC (rev 5097)
+++ trunk/kfreebsd-11/debian/control.in	2013-10-26 18:10:21 UTC (rev 5098)
@@ -12,7 +12,7 @@
  @cc_pkg@, libdb-dev,
  libbsd-dev (>= 0.3.0), pkg-config,
  libsbuf-dev (>= 9.0+ds1-2),
- kernel-wedge (>= 2.79) [kfreebsd-any],
+ kernel-wedge (>= 2.88) [kfreebsd-any],
 Standards-Version: 3.9.2
 
 Package: kfreebsd-source- at version@

Modified: trunk/kfreebsd-11/debian/rules
===================================================================
--- trunk/kfreebsd-11/debian/rules	2013-10-26 15:48:41 UTC (rev 5097)
+++ trunk/kfreebsd-11/debian/rules	2013-10-26 18:10:21 UTC (rev 5098)
@@ -167,8 +167,8 @@
 	# Change ident to the kernel version
 	sed -i -e 's/^i=.*/i="Debian $* ($(full_version))"/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
+	# Override module dir
+	sed -i -e 's,^KODIR?=.*,KODIR="/boot/modules/$(version)-$(abiname)-$*",g' $(FLAVOR_DIR)-$*/sys/conf/kern.pre.mk
 
 	# Always set explicit link target to match with ld's implicit target (needed
 	# to build on non-kFreeBSD)
@@ -221,7 +221,7 @@
 	dh_testroot
 	dh_clean -k -pkfreebsd-image-$(version)-$(abiname)-$*
 
-	mkdir -p $(IMAGE_PACKAGE)-$*/{boot,lib/modules/$(version)-$(abiname)-$*}
+	mkdir -p $(IMAGE_PACKAGE)-$*/boot/modules/$(version)-$(abiname)-$*
 
 	# make the install target happy
 	install -o root -g root -m 644 \
@@ -242,12 +242,12 @@
 
 	# now install the kernel
 	$(MAKE) CC=$(cc_cmd) -C $(FLAVOR_DIR)-$*/sys/$(kfreebsd_cpu)/compile/$(configfile) DESTDIR=$(IMAGE_PACKAGE)-$* install
-	mv $(IMAGE_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*/kernel $(IMAGE_PACKAGE)-$*/boot/kfreebsd-$(version)-$(abiname)-$*
+	mv $(IMAGE_PACKAGE)-$*/boot/modules/$(version)-$(abiname)-$*/kernel $(IMAGE_PACKAGE)-$*/boot/kfreebsd-$(version)-$(abiname)-$*
 	chmod 644 $(IMAGE_PACKAGE)-$*/boot/kfreebsd-$(version)-$(abiname)-$*
 	gzip -9 -n $(IMAGE_PACKAGE)-$*/boot/kfreebsd-$(version)-$(abiname)-$*
 
 	# fix broken perms in module dir
-	-chmod 644 $(IMAGE_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*/*
+	-chmod 644 $(IMAGE_PACKAGE)-$*/boot/modules/$(version)-$(abiname)-$*/*
 
 	# remove loader.conf (part of kfreebsd-loader)
 	rm -f $(IMAGE_PACKAGE)-$*/boot/loader.conf
@@ -256,6 +256,13 @@
 	# remove device.hints (built into kernel)
 	rm -f $(IMAGE_PACKAGE)-$*/boot/device.hints
 
+	# compatibility symlink
+	mkdir -p $(IMAGE_PACKAGE)-$*/lib/modules
+	ln -s \
+		../../boot/modules/$(version)-$(abiname)-$* \
+		$(IMAGE_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*
+
+
 	# README file
 	mkdir -p $(IMAGE_PACKAGE)-$*/usr/share/doc/kfreebsd-image-$(version)-$(abiname)-$*
 	install -p -o root -g root -m 644 \
@@ -342,12 +349,12 @@
 	dh_installdocs -s
 	dh_installchangelogs -s
 	dh_link -s
-	dh_strip -s -X/boot -X/lib/modules
+	dh_strip -s -X/boot
 	dh_compress -s
 	dh_fixperms -s
 	dh_makeshlibs -s
 	dh_installdeb -s
-	dh_shlibdeps -s -X/boot -X/lib/modules
+	dh_shlibdeps -s -X/boot
 	dh_gencontrol -s
 	dh_md5sums -s
 	dh_builddeb -s -- -Zxz