Source: linux
Version: 4.9.18-1
Severity: normal
Tags: patch
User: debian-68k@lists.debian.org
Usertags: m68k
Hi!
While working on fixing debian-installer on m68k, I ran into the
following problem after updating the m68k-specific configuration
to use the common m68k image:
# Set up modules.dep, ensure there is at least one standard dir (kernel
# in this case), so depmod will use its prune list for archs with no
# modules.
set -e; \
sysmap_name=; sysmap_opt=; if [ -n "t" ]; then [ ! -e
./tmp/cdrom/tree/boot/System.map-4.9.0-2-m68k ] ||
sysmap_name="./tmp/cdrom/tree/boot/System.map-4.9.0-2-m68k"; else [ ! -e
./tmp/cdrom/tree/boot/System.map ] ||
sysmap_name="./tmp/cdrom/tree/boot/System.map"; fi; [ -z "$sysmap_name" ] ||
sysmap_opt="-F $sysmap_name"; if [ -d ./tmp/cdrom/tree/lib/modules/4.9.0-2-m68k
] && [ -z "" ]; then mkdir -p ./tmp/cdrom/tree/lib/modules/4.9.0-2-m68k/kernel;
depmod $sysmap_opt -q -a -b ./tmp/cdrom/tree/ 4.9.0-2-m68k; fi; [ -z
"$sysmap_name" ] || mv $sysmap_name ./tmp/cdrom;
depmod: WARNING: Ignored deprecated option -q
# These files depmod makes are used by udev.
find ./tmp/cdrom/tree/lib/modules/ -maxdepth 2 -name 'modules*.bin' \
-not -name 'modules.builtin.bin' \
-not -type d | while read f; do rm -f ${f%.bin}; done
# These files are used to build special kernel images for some
# subarchitectures. Move them out of the way.
if [ -d ./tmp/cdrom/tree/usr/lib/kernel-image-4.9.0-2-m68k ]; then mv
./tmp/cdrom/tree/usr/lib/kernel-image-4.9.0-2-m68k ./tmp/cdrom/lib; fi; if [ -d
./tmp/cdrom/tree/usr/lib/linux-image-4.9.0-2-m68k ]; then mv
./tmp/cdrom/tree/usr/lib/linux-image-4.9.0-2-m68k ./tmp/cdrom/lib; fi;
# Move the kernel image out of the way.
mv -f ./tmp/cdrom/tree/boot/vmlinuz-4.9.0-2-m68k
./tmp/cdrom/vmlinuz-4.9.0-2-m68k;
mv: cannot stat './tmp/cdrom/tree/boot/vmlinuz-4.9.0-2-m68k': No such file or
directory
Makefile:310: recipe for target 'stamps/tree-unpack-cdrom-stamp' failed
make[7]: *** [stamps/tree-unpack-cdrom-stamp] Error 1
Looking into build/tmp/cdrom/tree/boot, both the kernel image as well
as the System.map file are missing the version suffix:
root@mama:/srv/d-i/debian-installer/installer# ls -l build/tmp/cdrom/tree/boot
total 3096
-rw-r--r-- 1 root root 1210526 Mar 30 01:16 System.map
-rw-r--r-- 1 root root 1957278 Mar 30 01:16 vmlinuz
root@mama:/srv/d-i/debian-installer/installer#
Thus, in order to fix this problem, please set the suffix option
for the d-i kernel image for m68k by applying the attached patch.
Thanks,
Adrian
--
.''`. John Paul Adrian Glaubitz
: :' : Debian Developer - glaub...@debian.org
`. `' Freie Universitaet Berlin - glaub...@physik.fu-berlin.de
`- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
>From b46957d3400a1395f09d80518a555ae964ca39ec Mon Sep 17 00:00:00 2001
From: John Paul Adrian Glaubitz <glaub...@physik.fu-berlin.de>
Date: Sun, 2 Apr 2017 21:48:56 +0200
Subject: [PATCH] [m68k] udeb: Enable suffix for kernel-image
---
debian/installer/m68k/kernel-versions | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/installer/m68k/kernel-versions
b/debian/installer/m68k/kernel-versions
index 86e3e98f3..ec5f9d3c4 100644
--- a/debian/installer/m68k/kernel-versions
+++ b/debian/installer/m68k/kernel-versions
@@ -1,2 +1,2 @@
# arch version flavour installedname suffix build-depends
-m68k - m68k - - -
+m68k - m68k - y -
--
2.11.0
