Re: Bug#633561: kfreebsd-i386 d-i/squeeze FTBFS (was Re: Bug#633561: pu: package kfreebsd-8/8.1+dfsg-8+squeeze1)

2011-10-07 Thread Adam D. Barratt 
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: Bug#633561: kfreebsd-i386 d-i/squeeze FTBFS (was Re: Bug#633561: pu: package kfreebsd-8/8.1+dfsg-8+squeeze1)

2011-10-06 Thread Julien Cristau 
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-06 Thread Robert Millan 
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: Bug#633561: kfreebsd-i386 d-i/squeeze FTBFS (was Re: Bug#633561: pu: package kfreebsd-8/8.1+dfsg-8+squeeze1)

2011-10-05 Thread Philipp Kern 
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: Bug#633561: kfreebsd-i386 d-i/squeeze FTBFS (was Re: Bug#633561: pu: package kfreebsd-8/8.1+dfsg-8+squeeze1)

2011-10-05 Thread Robert Millan 
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