[Glibc-bsd-commits] r1500 - in trunk: kfreebsd-5/debian
kfreebsd-5/debian/patches kfreebsd-6/debian
kfreebsd-6/debian/patches
Robert Millan
rmh at costa.debian.org
Wed Apr 26 17:35:13 UTC 2006
Author: rmh
Date: 2006-04-26 17:35:10 +0000 (Wed, 26 Apr 2006)
New Revision: 1500
Removed:
trunk/kfreebsd-5/debian/patches/901_loader_conf.diff
trunk/kfreebsd-6/debian/patches/901_loader_conf.diff
Modified:
trunk/kfreebsd-5/debian/changelog
trunk/kfreebsd-5/debian/kfreebsd-image.conffiles.in
trunk/kfreebsd-5/debian/kfreebsd-image.overrides
trunk/kfreebsd-5/debian/rules
trunk/kfreebsd-6/debian/changelog
trunk/kfreebsd-6/debian/kfreebsd-image.conffiles.in
trunk/kfreebsd-6/debian/kfreebsd-image.overrides
trunk/kfreebsd-6/debian/rules
Log:
Disable /boot/loader.conf (provided in kfreebsd-loader now).
(this change applied both in 5.x and 6.x)
Modified: trunk/kfreebsd-5/debian/changelog
===================================================================
--- trunk/kfreebsd-5/debian/changelog 2006-04-26 16:41:27 UTC (rev 1499)
+++ trunk/kfreebsd-5/debian/changelog 2006-04-26 17:35:10 UTC (rev 1500)
@@ -1,3 +1,9 @@
+kfreebsd-5 (5.4-18) UNRELEASED; urgency=low
+
+ * Disable /boot/loader.conf (provided in kfreebsd-loader now).
+
+ -- Robert Millan <rmh at aybabtu.com> Wed, 26 Apr 2006 19:33:05 +0200
+
kfreebsd-5 (5.4-17) unstable; urgency=high
* Urgency set to high as this fixes a security bug.
Modified: trunk/kfreebsd-5/debian/kfreebsd-image.conffiles.in
===================================================================
--- trunk/kfreebsd-5/debian/kfreebsd-image.conffiles.in 2006-04-26 16:41:27 UTC (rev 1499)
+++ trunk/kfreebsd-5/debian/kfreebsd-image.conffiles.in 2006-04-26 17:35:10 UTC (rev 1500)
@@ -1,2 +1 @@
/boot/device.hints
-/boot/loader.conf
Modified: trunk/kfreebsd-5/debian/kfreebsd-image.overrides
===================================================================
--- trunk/kfreebsd-5/debian/kfreebsd-image.overrides 2006-04-26 16:41:27 UTC (rev 1499)
+++ trunk/kfreebsd-5/debian/kfreebsd-image.overrides 2006-04-26 17:35:10 UTC (rev 1500)
@@ -1,5 +1,4 @@
shlib-with-non-pic-code
shared-lib-without-dependency-information
non-etc-file-marked-as-conffile /boot/device.hints
-non-etc-file-marked-as-conffile /boot/loader.conf
Deleted: trunk/kfreebsd-5/debian/patches/901_loader_conf.diff
===================================================================
--- trunk/kfreebsd-5/debian/patches/901_loader_conf.diff 2006-04-26 16:41:27 UTC (rev 1499)
+++ trunk/kfreebsd-5/debian/patches/901_loader_conf.diff 2006-04-26 17:35:10 UTC (rev 1500)
@@ -1,10 +0,0 @@
---- sys/boot/forth/loader.conf.orig
-+++ sys/boot/forth/loader.conf
-@@ -35,6 +35,7 @@
- bitmap_load="NO" # Set this to YES if you want splash screen!
- bitmap_name="splash.bmp" # Set this to the name of the bmp or pcx file
- bitmap_type="splash_image_data" # and place it on the module_path
-+loader_color="YES" # Color boot screen
-
-
- ##############################################################
Modified: trunk/kfreebsd-5/debian/rules
===================================================================
--- trunk/kfreebsd-5/debian/rules 2006-04-26 16:41:27 UTC (rev 1499)
+++ trunk/kfreebsd-5/debian/rules 2006-04-26 17:35:10 UTC (rev 1500)
@@ -119,6 +119,8 @@
install -o root -g root -m 644 \
$(FLAVOR_DIR)-$*/sys/$(cpu)/conf/GENERIC.hints \
$(IMAGE_PACKAGE)-$*/boot/device.hints
+
+ # make the install target happy
install -o root -g root -m 644 \
$(FLAVOR_DIR)-$*/sys/boot/forth/loader.conf \
$(IMAGE_PACKAGE)-$*/boot/loader.conf
@@ -131,6 +133,10 @@
$(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
+
+ # remove loader.conf (part of kfreebsd-loader now)
+ rm -f $(IMAGE_PACKAGE)-$*/boot/loader.conf
+ rm -rf $(IMAGE_PACKAGE)-$*/boot/defaults
# override file
mkdir -p $(IMAGE_PACKAGE)-$*/usr/share/lintian/overrides
Modified: trunk/kfreebsd-6/debian/changelog
===================================================================
--- trunk/kfreebsd-6/debian/changelog 2006-04-26 16:41:27 UTC (rev 1499)
+++ trunk/kfreebsd-6/debian/changelog 2006-04-26 17:35:10 UTC (rev 1500)
@@ -1,8 +1,8 @@
kfreebsd-6 (6.0-0.3) UNRELEASED; urgency=low
- *
+ * Disable /boot/loader.conf (provided in kfreebsd-loader now).
- -- Robert Millan <rmh at aybabtu.com> Wed, 26 Apr 2006 18:02:52 +0200
+ -- Robert Millan <rmh at aybabtu.com> Wed, 26 Apr 2006 19:33:24 +0200
kfreebsd-6 (6.0-0.2) unreleased; urgency=low
Modified: trunk/kfreebsd-6/debian/kfreebsd-image.conffiles.in
===================================================================
--- trunk/kfreebsd-6/debian/kfreebsd-image.conffiles.in 2006-04-26 16:41:27 UTC (rev 1499)
+++ trunk/kfreebsd-6/debian/kfreebsd-image.conffiles.in 2006-04-26 17:35:10 UTC (rev 1500)
@@ -1,2 +1 @@
/boot/device.hints
-/boot/loader.conf
Modified: trunk/kfreebsd-6/debian/kfreebsd-image.overrides
===================================================================
--- trunk/kfreebsd-6/debian/kfreebsd-image.overrides 2006-04-26 16:41:27 UTC (rev 1499)
+++ trunk/kfreebsd-6/debian/kfreebsd-image.overrides 2006-04-26 17:35:10 UTC (rev 1500)
@@ -1,5 +1,4 @@
shlib-with-non-pic-code
shared-lib-without-dependency-information
non-etc-file-marked-as-conffile /boot/device.hints
-non-etc-file-marked-as-conffile /boot/loader.conf
Deleted: trunk/kfreebsd-6/debian/patches/901_loader_conf.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/901_loader_conf.diff 2006-04-26 16:41:27 UTC (rev 1499)
+++ trunk/kfreebsd-6/debian/patches/901_loader_conf.diff 2006-04-26 17:35:10 UTC (rev 1500)
@@ -1,11 +0,0 @@
---- sys/boot/forth/loader.conf~ 2005-12-16 17:12:00.000000000 +0100
-+++ sys/boot/forth/loader.conf 2005-12-16 17:12:58.000000000 +0100
-@@ -35,7 +35,7 @@
- bitmap_load="NO" # Set this to YES if you want splash screen!
- bitmap_name="splash.bmp" # Set this to the name of the bmp or pcx file
- bitmap_type="splash_image_data" # and place it on the module_path
--loader_color="NO" # Set this to YES to enable splash screen colors
-+loader_color="YES" # Set this to YES to enable splash screen colors
-
-
- ##############################################################
Modified: trunk/kfreebsd-6/debian/rules
===================================================================
--- trunk/kfreebsd-6/debian/rules 2006-04-26 16:41:27 UTC (rev 1499)
+++ trunk/kfreebsd-6/debian/rules 2006-04-26 17:35:10 UTC (rev 1500)
@@ -144,6 +144,8 @@
install -o root -g root -m 644 \
$(FLAVOR_DIR)-$*/sys/$(cpu)/conf/GENERIC.hints \
$(IMAGE_PACKAGE)-$*/boot/device.hints
+
+ # make the install target happy
install -o root -g root -m 644 \
$(FLAVOR_DIR)-$*/sys/boot/forth/loader.conf \
$(IMAGE_PACKAGE)-$*/boot/loader.conf
@@ -156,6 +158,10 @@
$(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
+
+ # remove loader.conf (part of kfreebsd-loader now)
+ rm -f $(IMAGE_PACKAGE)-$*/boot/loader.conf
+ rm -rf $(IMAGE_PACKAGE)-$*/boot/defaults
# override file
mkdir -p $(IMAGE_PACKAGE)-$*/usr/share/lintian/overrides
More information about the Glibc-bsd-commits
mailing list