r1125 - trunk/kfreebsd-6/debian
Author: rmh
Date: 2006-02-04 13:35:32 +0000 (Sat, 04 Feb 2006)
New Revision: 1125
Modified:
trunk/kfreebsd-6/debian/changelog
trunk/kfreebsd-6/debian/control
trunk/kfreebsd-6/debian/control.flavor.in
trunk/kfreebsd-6/debian/control.in
trunk/kfreebsd-6/debian/rules
Log:
* Merge 5.x branch changes (from rev 872 to rev 1058).
* Add src/usr.sbin/config into the source and build/use it dynamicaly.
Modified: trunk/kfreebsd-6/debian/changelog
===================================================================
--- trunk/kfreebsd-6/debian/changelog 2006-02-04 13:04:12 UTC (rev 1124)
+++ trunk/kfreebsd-6/debian/changelog 2006-02-04 13:35:32 UTC (rev 1125)
@@ -6,7 +6,8 @@
* Disabled the non-free nvenet driver.
* Disabled the non-compiling hwpmc driver.
[ Robert Millan ]
- * Merge 5.x branch changes (from rev 654 to rev 872)
+ * Merge 5.x branch changes (from rev 654 to rev 1058)
+ * Add src/usr.sbin/config into the source and build/use it dynamicaly.
-- Robert Millan <rmh@aybabtu.com> Sat, 12 Nov 2005 20:30:37 +0100
Modified: trunk/kfreebsd-6/debian/control
===================================================================
--- trunk/kfreebsd-6/debian/control 2006-02-04 13:04:12 UTC (rev 1124)
+++ trunk/kfreebsd-6/debian/control 2006-02-04 13:35:32 UTC (rev 1125)
@@ -4,7 +4,7 @@
Maintainer: GNU/kFreeBSD Maintainers <debian-bsd@lists.debian.org>
Uploaders: Aurelien Jarno <aurel32@debian.org>, Guillem Jover <guillem@debian.org>
Build-Depends-Indep: debhelper (>= 4.1.0), bzip2, patchutils (>= 0.2.25)
-Build-Depends: debhelper (>= 4.1.0), bzip2, patchutils (>= 0.2.25), dpkg (>= 1.13.9), freebsd6-buildutils (>= 6.0), libdb4.3-dev | libdb-dev, flex-old | flex, gcc-3.4, sharutils
+Build-Depends: debhelper (>= 4.1.0), bzip2, patchutils (>= 0.2.25), dpkg (>= 1.13.9), freebsd-buildutils (>= 6) | freebsd5-buildutils, libdb4.3-dev | libdb-dev, flex-old | flex, gcc-3.4, sharutils, libbsd-dev
Standards-Version: 3.6.2
Package: kfreebsd-source-6.0
@@ -40,6 +40,7 @@
Provides: kfreebsd-image-6, kfreebsd-image
Conflicts: kfreebsd5, kfreebsd-image
Replaces: kfreebsd5
+Recommends:
Description: kernel of FreeBSD 6.0 image
This package provides the binary image and pre-built loadable modules for
the kernel of FreeBSD 6.0, base of a GNU/kFreeBSD system.
@@ -59,7 +60,6 @@
Section: devel
Provides: kfreebsd-headers-6
Depends: kfreebsd-headers-6.0-1 (= ${Source-Version})
-Recommends:
Description: header files for kernel of FreeBSD 6.0
This package provides the header files for kernel of FreeBSD 6.0, generally
used for building out-of-tree kernel modules. These files are going to be
Modified: trunk/kfreebsd-6/debian/control.flavor.in
===================================================================
--- trunk/kfreebsd-6/debian/control.flavor.in 2006-02-04 13:04:12 UTC (rev 1124)
+++ trunk/kfreebsd-6/debian/control.flavor.in 2006-02-04 13:35:32 UTC (rev 1125)
@@ -5,6 +5,7 @@
Provides: kfreebsd-image-@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
the kernel of FreeBSD @version@, base of a GNU/kFreeBSD system.
@@ -24,7 +25,6 @@
Section: devel
Provides: kfreebsd-headers-@major@
Depends: kfreebsd-headers-@version@-@abiname@ (= ${Source-Version})
-Recommends: @recommends@
Description: header files for kernel of FreeBSD @version@
This package provides the header files for kernel of FreeBSD @version@, generally
used for building out-of-tree kernel modules. These files are going to be
Modified: trunk/kfreebsd-6/debian/control.in
===================================================================
--- trunk/kfreebsd-6/debian/control.in 2006-02-04 13:04:12 UTC (rev 1124)
+++ trunk/kfreebsd-6/debian/control.in 2006-02-04 13:35:32 UTC (rev 1125)
@@ -4,7 +4,7 @@
Maintainer: GNU/kFreeBSD Maintainers <debian-bsd@lists.debian.org>
Uploaders: Aurelien Jarno <aurel32@debian.org>, Guillem Jover <guillem@debian.org>
Build-Depends-Indep: debhelper (>= 4.1.0), bzip2, patchutils (>= 0.2.25)
-Build-Depends: debhelper (>= 4.1.0), bzip2, patchutils (>= 0.2.25), dpkg (>= 1.13.9), freebsd@major@-buildutils (>= @version@), libdb4.3-dev | libdb-dev, flex-old | flex, gcc-3.4, sharutils
+Build-Depends: debhelper (>= 4.1.0), bzip2, patchutils (>= 0.2.25), dpkg (>= 1.13.9), freebsd-buildutils (>= @major@) | freebsd5-buildutils, libdb4.3-dev | libdb-dev, flex-old | flex, gcc-3.4, sharutils, libbsd-dev
Standards-Version: 3.6.2
Package: kfreebsd-source-@version@
Modified: trunk/kfreebsd-6/debian/rules
===================================================================
--- trunk/kfreebsd-6/debian/rules 2006-02-04 13:04:12 UTC (rev 1124)
+++ trunk/kfreebsd-6/debian/rules 2006-02-04 13:35:32 UTC (rev 1125)
@@ -25,7 +25,7 @@
FLAVOR_DIR := flavor-$(version)-$(abiname)
MAKE := make MACHINE_ARCH=$(cpu) CC=gcc-3.4 WERROR=
-PATH := /usr/lib/freebsd6:/usr/lib/freebsd:$(PATH)
+PATH := $(CURDIR)/config:/usr/lib/freebsd:$(PATH)
control:
sed -e "s/@major@/$(major)/g" -e "s/@version@/$(version)/g" -e "s/@abiname@/$(abiname)/g" -e "s/@flavor@/$$flavor/g" \
@@ -42,7 +42,7 @@
clean:
dh_testdir
dh_testroot
- rm -rf src kfreebsd-source-* flavor-*
+ rm -rf src kfreebsd-source-* flavor-* config
rm -f debian/kfreebsd-image-*.{conffiles,preinst,postinst}
rm -f *-stamp
@@ -81,8 +81,12 @@
touch install-indep-stamp
+config: src
+ cp -af src/usr.sbin/config config
+ $(MAKE) -C config
+
build-arch: $(foreach flavor,$(flavours),build-flavor-$(flavor)-stamp)
-build-flavor-%-stamp: src
+build-flavor-%-stamp: src config
cp -af src $(FLAVOR_DIR)-$*
# Add the abiname and the flavor to the kernel version
Reply to: