Re: Bug#633561: kfreebsd-i386 d-i/squeeze FTBFS (was Re: Bug#633561: pu: package kfreebsd-8/8.1+dfsg-8+squeeze1)
On Thu, 2011-10-06 at 23:12 +0200, Robert Millan wrote: 2011/10/6 Julien Cristau jcris...@debian.org: On Thu, Oct 6, 2011 at 07:20:50 +0200, Robert Millan wrote: Attached patch should fix the problem. I can upload a fixed kfreebsd-8 this evening (feel free to NMU if someone has time to verify earlier than that). What's the status of that upload? I realized the symlink in kfreebsd-8 had nothing to do with this. The actual problem was in kernel-wedge and kfreebsd-kernel-di-i386. Ah, okay. I've just NMUed both packages. Debdiffs attached. For the record, the NMUs were acked on IRC and accepted earlier today. I gave the kfreebsd-i386 d-i build back and it built successfully; thanks. Regards, Adam -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1318012540.29287.3.ca...@hathi.jungle.funky-badger.org
Re: kfreebsd-i386 d-i/squeeze FTBFS (was Re: Bug#633561: pu: package kfreebsd-8/8.1+dfsg-8+squeeze1)
On Thu, 6 Oct 2011 07:20:50 +0200, Robert Millan wrote: 2011/10/6 Adam D. Barratt a...@adam-barratt.org.uk: test -e ./tmp/cdrom/tree/boot/zfs || rmdir ./tmp/cdrom/tree/boot/ rmdir: failed to remove `./tmp/cdrom/tree/boot/': Directory not empty [...] $ debdiff kernel-image-8.1-1-486-di_0.6_kfreebsd-i386.udeb kernel-image-8.1-1-486-di_0.6+b1_kfreebsd-i386.udeb [...] Files in second .deb but not in first - -rw-r--r-- root/root /boot/acpi.ko This appears to be due to the fact that the new kfreebsd-8 +squeeze1 kernel on -i386 builds acpi.ko as a module, which is then picked up by existing install this module if it exists rules in kernel-wedge. Actually, the problem is not presence of acpi.ko itself, but the fact that a symlink to this file exists in /boot/. This is due to an old postinst kludge from pre-GRUB time. Okay. A quick fix would be appreciated, whether from the kfreebsd or d-i side, given the increasingly short period of time we have remaining until the point release is scheduled. Attached patch should fix the problem. I can upload a fixed kfreebsd-8 this evening (feel free to NMU if someone has time to verify earlier than that). Forgive my ignorance on the precise mechanics, but is it correct that the /boot/kernel/kernel.gz symlink creation was also removed? Would you be able to also upload a kfreebsd-i386 build? That would help reduce the turnaround time before we can schedule a rebuild of kfreebsd-kernel-di-i386. Regards, Adam -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/ac1933eacf629d91a4529827b879e...@adsl.funky-badger.org
Re: Bug#633561: kfreebsd-i386 d-i/squeeze FTBFS (was Re: Bug#633561: pu: package kfreebsd-8/8.1+dfsg-8+squeeze1)
On Thu, Oct 6, 2011 at 07:20:50 +0200, Robert Millan wrote: Attached patch should fix the problem. I can upload a fixed kfreebsd-8 this evening (feel free to NMU if someone has time to verify earlier than that). What's the status of that upload? Cheers, Julien -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20111006202051.gq2...@radis.liafa.jussieu.fr
Re: Bug#633561: kfreebsd-i386 d-i/squeeze FTBFS (was Re: Bug#633561: pu: package kfreebsd-8/8.1+dfsg-8+squeeze1)
2011/10/6 Julien Cristau jcris...@debian.org:
On Thu, Oct 6, 2011 at 07:20:50 +0200, Robert Millan wrote:
Attached patch should fix the problem. I can upload a fixed
kfreebsd-8 this evening (feel free to NMU if someone has time to
verify earlier than that).
What's the status of that upload?
I realized the symlink in kfreebsd-8 had nothing to do with this. The
actual problem was in kernel-wedge and kfreebsd-kernel-di-i386.
I've just NMUed both packages.
Debdiffs attached.
--
Robert Millan
diff -Nru kernel-wedge-2.74+squeeze3/commands/install-files kernel-wedge-2.74+squeeze3.1/commands/install-files
--- kernel-wedge-2.74+squeeze3/commands/install-files 2011-04-05 04:45:45.0 +0200
+++ kernel-wedge-2.74+squeeze3.1/commands/install-files 2011-10-06 23:01:33.0 +0200
@@ -67,11 +67,6 @@
doit(install, -D, -m, 644,
$sourcedir/boot/kfreebsd-$installedname.gz,
debian/kernel-image-$kernelversion-$flavour-di/boot/kfreebsd$extraname.gz);
- if (-e $sourcedir/lib/modules/$kernelversion-$flavour/acpi.ko) {
- doit(install, -D, -m, 644,
-$sourcedir/lib/modules/$kernelversion-$flavour/acpi.ko,
-debian/kernel-image-$kernelversion-$flavour-di/boot/acpi$extraname.ko);
- }
}
else {
die could not find kernel image;
diff -Nru kernel-wedge-2.74+squeeze3/debian/changelog kernel-wedge-2.74+squeeze3.1/debian/changelog
--- kernel-wedge-2.74+squeeze3/debian/changelog 2011-06-22 03:09:24.0 +0200
+++ kernel-wedge-2.74+squeeze3.1/debian/changelog 2011-10-06 23:04:09.0 +0200
@@ -1,3 +1,10 @@
+kernel-wedge (2.74+squeeze3.1) stable-proposed-updates; urgency=low
+
+ * NMU.
+ * Stop considering acpi.ko as part of the kernel for kFreeBSD.
+
+ -- Robert Millan r...@debian.org Thu, 06 Oct 2011 21:02:18 +
+
kernel-wedge (2.74+squeeze3) stable-proposed-updates; urgency=low
* scsi-extra-modules: hpsa
diff -Nru kfreebsd-kernel-di-i386-0.6/debian/changelog kfreebsd-kernel-di-i386-0.6.1/debian/changelog
--- kfreebsd-kernel-di-i386-0.6/debian/changelog 2011-01-10 15:45:57.0 +0100
+++ kfreebsd-kernel-di-i386-0.6.1/debian/changelog 2011-10-06 23:05:54.0 +0200
@@ -1,3 +1,10 @@
+kfreebsd-kernel-di-i386 (0.6.1) stable; urgency=low
+
+ * NMU.
+ * Rebuild with latest kernel-wedge. Bump build-dependency.
+
+ -- Robert Millan r...@debian.org Thu, 06 Oct 2011 21:05:05 +
+
kfreebsd-kernel-di-i386 (0.6) unstable; urgency=low
* Build against version 8.1+dfsg-7.1.
diff -Nru kfreebsd-kernel-di-i386-0.6/debian/control kfreebsd-kernel-di-i386-0.6.1/debian/control
--- kfreebsd-kernel-di-i386-0.6/debian/control 2011-01-10 16:03:41.0 +0100
+++ kfreebsd-kernel-di-i386-0.6.1/debian/control 2011-10-06 23:06:34.0 +0200
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Install System Team debian-boot@lists.debian.org
Uploaders: Otavio Salvador ota...@debian.org, Aurelien Jarno aure...@debian.org
-Build-Depends: kernel-wedge (= 2.66), kfreebsd-image-8.1-1-486 [kfreebsd-i386]
+Build-Depends: kernel-wedge (= 2.74+squeeze3.1), kfreebsd-image-8.1-1-486 [kfreebsd-i386]
Package: kernel-image-8.1-1-486-di
XC-Package-Type: udeb
diff -Nru kfreebsd-kernel-di-i386-0.6/debian/control.stub kfreebsd-kernel-di-i386-0.6.1/debian/control.stub
--- kfreebsd-kernel-di-i386-0.6/debian/control.stub 2010-08-23 02:02:59.0 +0200
+++ kfreebsd-kernel-di-i386-0.6.1/debian/control.stub 2011-10-06 23:04:53.0 +0200
@@ -3,4 +3,4 @@
Priority: optional
Maintainer: Debian Install System Team debian-boot@lists.debian.org
Uploaders: Otavio Salvador ota...@debian.org, Aurelien Jarno aure...@debian.org
-Build-Depends: kernel-wedge (= 2.66)
+Build-Depends: kernel-wedge (= 2.74+squeeze3.1)
Re: kfreebsd-i386 d-i/squeeze FTBFS (was Re: Bug#633561: pu: package kfreebsd-8/8.1+dfsg-8+squeeze1)
2011/10/6 Adam D. Barratt a...@adam-barratt.org.uk: Forgive my ignorance on the precise mechanics, but is it correct that the /boot/kernel/kernel.gz symlink creation was also removed? Yes, this is all curft for backward compatibility with versions of Debian GNU/kFreeBSD that have never been part of a Debian release. However, it's not the cause for this problem (see my other mail). In fact it's probably harmless, and it's gone with 8.2 anyway. I wouldn't worry about them. -- Robert Millan -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/CAOfDtXNcHrf=_6GseYRVE=+wxeqa0e8rhwedvtfvnhu4d3h...@mail.gmail.com
kfreebsd-i386 d-i/squeeze FTBFS (was Re: Bug#633561: pu: package kfreebsd-8/8.1+dfsg-8+squeeze1)
[tl,dr; these changes broke d-i in stable] On Sat, 2011-10-01 at 00:25 +0200, Robert Millan wrote: 2011/9/27 Adam D. Barratt a...@adam-barratt.org.uk: - Does this affect which modules end up in the udebs? It looks like this was missed in the original follow-up. As a related query, has a test build of kfreebsd-kernel-di-* been performed in order to find out whether any additional modules get pulled in to the packages? I just tried. The resulting file lists are identical. debian-installer was binNMUed earlier today in preparation for the point release, and FTBFS on kfreebsd-i386. The log finishes with: # Move the kernel image out of the way. mv -f ./tmp/cdrom/tree/boot/kfreebsd.gz ./tmp/cdrom/kfreebsd.gz; test -e ./tmp/cdrom/tree/boot/zfs || rmdir ./tmp/cdrom/tree/boot/ rmdir: failed to remove `./tmp/cdrom/tree/boot/': Directory not empty make[7]: *** [stamps/tree-unpack-cdrom-stamp] Error 1 The problem appears to be that the contents of the kernel udeb have changed: $ debdiff kernel-image-8.1-1-486-di_0.6_kfreebsd-i386.udeb kernel-image-8.1-1-486-di_0.6+b1_kfreebsd-i386.udeb [...] Files in second .deb but not in first - -rw-r--r-- root/root /boot/acpi.ko This appears to be due to the fact that the new kfreebsd-8 +squeeze1 kernel on -i386 builds acpi.ko as a module, which is then picked up by existing install this module if it exists rules in kernel-wedge. A quick fix would be appreciated, whether from the kfreebsd or d-i side, given the increasingly short period of time we have remaining until the point release is scheduled. Regards, Adam -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1317853200.4522.22.ca...@hathi.jungle.funky-badger.org
Re: Bug#633561: kfreebsd-i386 d-i/squeeze FTBFS (was Re: Bug#633561: pu: package kfreebsd-8/8.1+dfsg-8+squeeze1)
On Wed, Oct 05, 2011 at 11:20:00PM +0100, Adam D. Barratt wrote: [tl,dr; these changes broke d-i in stable] I think in the worst case we can just keep the current (as in non-point release version) of d-i on kfreebsd-* for the next point release and don't update to the binNMU. It's actually from the same source, so there are no issues with introducing out-of-dates. It's not that we'd need any urgent fixes in d-i on kfreebsd. That said, this needs to be fixed, and we're all not very happy, given the fact that we actually did ask before if something changes in the udeb output. Kind regards Philipp Kern signature.asc Description: Digital signature
Re: kfreebsd-i386 d-i/squeeze FTBFS (was Re: Bug#633561: pu: package kfreebsd-8/8.1+dfsg-8+squeeze1)
2011/10/6 Adam D. Barratt a...@adam-barratt.org.uk:
test -e ./tmp/cdrom/tree/boot/zfs || rmdir ./tmp/cdrom/tree/boot/
rmdir: failed to remove `./tmp/cdrom/tree/boot/': Directory not empty
[...]
$ debdiff kernel-image-8.1-1-486-di_0.6_kfreebsd-i386.udeb
kernel-image-8.1-1-486-di_0.6+b1_kfreebsd-i386.udeb
[...]
Files in second .deb but not in first
-
-rw-r--r-- root/root /boot/acpi.ko
This appears to be due to the fact that the new kfreebsd-8 +squeeze1
kernel on -i386 builds acpi.ko as a module, which is then picked up by
existing install this module if it exists rules in kernel-wedge.
Actually, the problem is not presence of acpi.ko itself, but the fact
that a symlink to this file exists in /boot/. This is due to an old
postinst kludge from pre-GRUB time.
A quick fix would be appreciated, whether from the kfreebsd or d-i side,
given the increasingly short period of time we have remaining until the
point release is scheduled.
Attached patch should fix the problem. I can upload a fixed
kfreebsd-8 this evening (feel free to NMU if someone has time to
verify earlier than that).
--
Robert Millan
Index: debian/kfreebsd-image.postinst.in
===
--- debian/kfreebsd-image.postinst.in (revision 3716)
+++ debian/kfreebsd-image.postinst.in (working copy)
@@ -24,37 +24,6 @@
case $1 in
configure)
-# Don't do symlinks if explicitely disabled
-if [ -z $(sed -e '/^\s*do_symlinks\s*=\s*\(no\|false\|0\)\s*$/!d' $KERNEL_IMG_CONF 2/dev/null) ] ; then
-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
-
- mkdir -p /boot/kernel
-
-if [ $(readlink -f /boot/kernel/kernel.gz) != /boot/kfreebsd-$RELEASE.gz ] ; then
-rm -f /boot/kernel/kernel.old.gz
-if [ -L /boot/kernel/kernel.gz ] ; then
-mv /boot/kernel/kernel.gz /boot/kernel/kernel.old.gz
-fi
-ln -s /boot/kfreebsd-$RELEASE.gz /boot/kernel/kernel.gz
-fi
-
-# on i386 acpi MUST be within kfreebsd-loader reach
-if [ ${RELEASE%%-[456]86} != ${RELEASE} ] ; then
-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 /boot/kernel/acpi.ko.old
-fi
-ln -s /lib/modules/$RELEASE/acpi.ko /boot/kernel/acpi.ko
-fi
-fi
-fi
-
# Sanitize and quote maintainer script parameters
for p in $@; do
q=$(echo $p | sed -e s/'/'\\''/g)
Re: Bug#633561: kfreebsd-i386 d-i/squeeze FTBFS (was Re: Bug#633561: pu: package kfreebsd-8/8.1+dfsg-8+squeeze1)
2011/10/6 Philipp Kern pk...@debian.org: That said, this needs to be fixed, and we're all not very happy, given the fact that we actually did ask before if something changes in the udeb output. I have to say in my defense that I did check for changes in udeb output. However these changes don't happen on my arch (kfreebsd-amd64), as they're i386-specific. I admit I should have checked both. -- Robert Millan -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/caofdtxn4+mlaehtgr8y3nyqru8sh-hgrxcm-l3fp58vyqaf...@mail.gmail.com
Re: Bug#633561: pu: package kfreebsd-8/8.1+dfsg-8+squeeze1
2011/10/2 Adam D. Barratt a...@adam-barratt.org.uk: If I'd been sure that binNMUs would work then we could have scheduled them directly; the previous uploads have all been sourceful, so I assumed there was a reason for that. In any case, I've flagged the uploads for acceptance at the next dinstall. I notice they've been installed. Thanks! -- Robert Millan -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/caofdtxp4a4aqrc7-hwqr-krskhjrbkjehrsvj3uaflmszpf...@mail.gmail.com
Re: Bug#633561: pu: package kfreebsd-8/8.1+dfsg-8+squeeze1
2011/10/1 Adam D. Barratt a...@adam-barratt.org.uk: If there are changes which need propagating to the udebs Yes. The if_msk update is specially important for the installer. If the aim is to do that for 6.0.3 then those uploads need to happen within the next day, or they'll miss the cut-off. I've uploaded a BinNMU for both packages. -- Robert Millan -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/CAOfDtXPW77aouTqOvyC=vpfjhhvmvpg53+eg0npoioy6t4-...@mail.gmail.com
Re: Bug#633561: pu: package kfreebsd-8/8.1+dfsg-8+squeeze1
On Sun, 2011-10-02 at 14:37 +0200, Robert Millan wrote: 2011/10/1 Adam D. Barratt a...@adam-barratt.org.uk: If there are changes which need propagating to the udebs Yes. The if_msk update is specially important for the installer. If the aim is to do that for 6.0.3 then those uploads need to happen within the next day, or they'll miss the cut-off. I've uploaded a BinNMU for both packages. If I'd been sure that binNMUs would work then we could have scheduled them directly; the previous uploads have all been sourceful, so I assumed there was a reason for that. In any case, I've flagged the uploads for acceptance at the next dinstall. Regards, Adam -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1317561661.2999.77.ca...@hathi.jungle.funky-badger.org
Re: Bug#633561: pu: package kfreebsd-8/8.1+dfsg-8+squeeze1
On Sat, 2011-10-01 at 22:59 +0200, Robert Millan wrote: 2011/10/1 Adam D. Barratt a...@adam-barratt.org.uk: On Sat, 2011-10-01 at 12:23 +0200, Robert Millan wrote: 2011/10/1 Adam D. Barratt a...@adam-barratt.org.uk: Please go ahead, bearing in mind that the upload window for the Squeeze point release closes over this weekend. Uploaded. Flagged for acceptance at the next dinstall; thanks. Thank you. Btw, how do we go about propagating this to kfreebsd-kernel-di-*? If there are changes which need propagating to the udebs - which isn't always the case, as evidenced by the fact that the last build was against 8.1+dfsg-7.1 - someone from -boot needs to upload both source packages; it looks like Aurelien has done that in the past. If the aim is to do that for 6.0.3 then those uploads need to happen within the next day, or they'll miss the cut-off. Regards, Adam -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1317503521.2999.72.ca...@hathi.jungle.funky-badger.org
Re: Bug#633561: pu: package kfreebsd-8/8.1+dfsg-8+squeeze1
2011/10/1 Adam D. Barratt a...@adam-barratt.org.uk: On Sat, 2011-10-01 at 12:23 +0200, Robert Millan wrote: 2011/10/1 Adam D. Barratt a...@adam-barratt.org.uk: Please go ahead, bearing in mind that the upload window for the Squeeze point release closes over this weekend. Uploaded. Flagged for acceptance at the next dinstall; thanks. Thank you. Btw, how do we go about propagating this to kfreebsd-kernel-di-*? -- Robert Millan -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/CAOfDtXNrTHjp=ecqgk5m1n5vbprqiakpckfdtt2pdcbk-ep...@mail.gmail.com
