On Wed, Mar 02, 2005 at 11:10:28PM +0000, Colin Watson wrote:
> Package: kernel-image-2.4.27-powerpc
> Version: 2.4.27-3
> Severity: critical
>
> The complete contents of kernel-image-2.4.27-powerpc.postinst are now as
> follows:
>
> #!/bin/sh
> set -e
> # Automatically added by dh_installmodules
> if [ "$1" = "configure" ] && [ -x /sbin/update-modules ]; then
> update-modules >/dev/null
> fi
> # End automatically added section
>
> When inserting this packages into a test image, the /vmlinux symlink is
> naturally never created, and the installation fails. Please fix this
> immediately, preferably by reverting to the previous well-tested
> postinst from kernel-package.
I think the attached patch will do the job, although I'm still building.
Since fixing this is very urgent for the d-i release schedule, and since
the build takes a while and a maintainer upload tomorrow might well miss
dinstall, I intend to NMU with this patch if the build succeeds and the
packages look sane, probably after building, burning, and testing a CD
image containing them. My apologies in advance for the breach of
protocol.
The --no-print-directory change was needed to make the package build at
all, even unmodified.
Cheers,
--
Colin Watson [EMAIL PROTECTED]
diff -Nru /tmp/ucBysVAmx5/kernel-patch-powerpc-2.4.27-2.4.27/debian/changelog
/tmp/bCyYa1L5DP/kernel-patch-powerpc-2.4.27-2.4.27/debian/changelog
--- /tmp/ucBysVAmx5/kernel-patch-powerpc-2.4.27-2.4.27/debian/changelog
2005-02-26 10:59:47.000000000 +0000
+++ /tmp/bCyYa1L5DP/kernel-patch-powerpc-2.4.27-2.4.27/debian/changelog
2005-03-03 05:46:47.000000000 +0000
@@ -1,3 +1,15 @@
+kernel-patch-powerpc-2.4.27 (2.4.27-3.1) unstable; urgency=low
+
+ * Emergency non-maintainer upload to fix postinsts so the installer can
+ work.
+ * Use make --no-print-directory when outputting .configs.
+ * Copy kernel-package-generated maintainer scripts to output kernel-image
+ packages (closes: #297794). Implementation partly borrowed from
+ kernel-patch-powerpc-2.6.*, with adjustments to support 2.4's
+ subarchitecture/flavour build system.
+
+ -- Colin Watson <[EMAIL PROTECTED]> Thu, 3 Mar 2005 05:46:45 +0000
+
kernel-patch-powerpc-2.4.27 (2.4.27-3) unstable; urgency=high
* New package, includes the apus powerpc subarch in addition to the
diff -Nru /tmp/ucBysVAmx5/kernel-patch-powerpc-2.4.27-2.4.27/debian/rules
/tmp/bCyYa1L5DP/kernel-patch-powerpc-2.4.27-2.4.27/debian/rules
--- /tmp/ucBysVAmx5/kernel-patch-powerpc-2.4.27-2.4.27/debian/rules
2005-02-27 16:57:59.000000000 +0000
+++ /tmp/bCyYa1L5DP/kernel-patch-powerpc-2.4.27-2.4.27/debian/rules
2005-03-03 05:46:38.000000000 +0000
@@ -130,7 +130,7 @@
$(M4) debian/control-subarch-$(arch)-$(subarch).m4 >>
$(KSUBARCH)/debian/control
zcat patches/debian-$(subarch).diff.gz | patch -p1 -d $(KSUBARCH)
rm -f $(KSUBARCH)/.config
- -$(MAKE) -s -C config $(subarch).default >$(KSUBARCH)/.config
+ -$(MAKE) -s --no-print-directory -C config $(subarch).default
>$(KSUBARCH)/.config
touch $@
@@ -152,8 +152,8 @@
$(M4) debian/control-subarch-$(arch)-$(subarch).m4 >>
$(KFLAVOUR)/debian/control
$(M4) debian/control-flavour-$(arch)-$(subarch)-$(flavour).m4 >>
$(KFLAVOUR)/debian/control
rm -f $(KFLAVOUR)/.config
- -$(MAKE) -s -C config $(flavour) > $(KFLAVOUR)/.config
-ifeq (powerpc,$(subarch))
+ -$(MAKE) -s --no-print-directory -C config $(flavour) >
$(KFLAVOUR)/.config
+ifeq (powerpc,$(flavours))
cd debian; cp -p post-install $(KFLAVOUR)/debian
endif
touch $@
@@ -333,26 +333,97 @@
endif
endif
+ifeq (0,$(MAKELEVEL))
+
+binary-subarch-kernel-image-$(kernel)-%:
+ $(MAKE) -f debian/rules binary-subarch-kernel-image-$(kernel)-$*
subarch=$*
+
+else
+ifeq (1,$(MAKELEVEL))
+
+# Per subarch binary processing.
+binary-subarch-kernel-image-$(kernel)-$(subarch): \
+stamp-install-subarch-$(subarch) \
+$(foreach
flavour,$(flavours),binary-flavour-kernel-image-$(kernel)-$(subarch)-$(flavour))
+ifeq (,$(flavours))
+ $(MAKE) -f debian/rules binary-subarch-image-package
DH_OPTIONS=-pkernel-image-$(kernel)-$(subarch)
+endif
+
+binary-flavour-kernel-image-$(kernel)-$(subarch)-%:
+ $(MAKE) -f debian/rules
binary-flavour-kernel-image-$(kernel)-$(subarch)-$* subarch=$(subarch)
flavour=$*
+
+else
+ifeq (2,$(MAKELEVEL))
+
+# Per flavour binary processing.
+binary-flavour-kernel-image-$(kernel)-$(subarch)-$(flavour): \
+stamp-install-flavour-$(subarch)-$(flavour)
+ $(MAKE) -f debian/rules binary-flavour-image-package
DH_OPTIONS=-pkernel-image-$(kernel)-$(flavour)
+
+endif
+endif
+endif
+
+binary-subarch-image-package: binary-common-package
+ dpkg -e $(KDUMMYSA) $(KIMAGESA)/DEBIAN
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary-flavour-image-package: binary-common-package
+ dpkg -e $(KDUMMY) $(KIMAGE)/DEBIAN
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary-subarch-kernel-%: stamp-install-subarch-$(subarch)
+ $(MAKE) -f debian/rules binary-package DH_OPTIONS=-pkernel-$*
+
+binary-package: binary-common-package
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary-common-package: stamp-configure stamp-build stamp-install
+ dh_testdir
+ dh_testroot
+ dh_installdocs
+ dh_installexamples -X.svn
+ dh_installmodules
+ dh_installchangelogs
+ dh_compress -X.stub
+ dh_link
+ dh_strip
+ dh_fixperms
+ dh_installdeb
+
+ifeq (0,$(MAKELEVEL))
+
+binary-subarch-%:
+ $(MAKE) -f debian/rules binary-subarch-$* subarch=$*
+
+else
+ifeq (1,$(MAKELEVEL))
+
+binary-subarch-$(subarch): \
+binary-subarch-kernel-patch-$(kernel)-$(subarch) \
+binary-subarch-kernel-headers-$(kernel)-$(subarch) \
+binary-subarch-kernel-image-$(kernel)-$(subarch) \
+binary-subarch-kernel-build-$(kernel)-$(subarch)
+
+endif
+endif
+
ifeq ($(DEB_HOST_ARCH),powerpc)
-binary: stamp-configure stamp-build stamp-install
- dh_testdir -a
- dh_testroot -a
- dh_installdocs -a
- dh_installexamples -X.svn -a
- dh_installmodules -a
- dh_installchangelogs -a
- dh_compress -X.stub -a
- dh_link -a
- dh_strip -a
- dh_fixperms -a
- dh_installdeb -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
+binary-arch: \
+$(foreach subarch,$(subarchs),binary-subarch-$(subarch))
else
-binary:
+binary-arch:
endif
+binary-indep:
+binary: binary-arch binary-indep
+
# the clean target flushes the whole shebang down the drain, generated
# files in debian/, build directories, stamp files, everything. The
# install-clean target reverts only the install stage, which is nice
