C. Scott Ananian wrote: > On Dec 16, 2007 7:14 PM, Bernardo Innocenti <[EMAIL PROTECTED]> wrote: >> The new-kernel-pkg script is part of mkinitrd :-( >> >> Please, allow me some time to come up with a straightforward >> fix that doesn't require putting mkinitrd back in the builds. > > Can you please do this in your private builds, and not break joyride > for the rest of us?
I apologize, that was of course totally unexpected. Anyway, both my private builds and joyride are currently broken due to missing static repos in Fedora's Koji: Parsing package install arguments http://koji.fedoraproject.org/static-repos/dist-olpc2-build-current/i386/repodata/repomd.xml: [Errno 14] HTTP Error 403: Forbidden Trying other mirror. Error: Cannot open/read repomd.xml file for repository: olpc_development Dennis, do you have any idea what happened? > As a stop gap, I'd recommend putting gzip & friends as explicit > dependencies of olpc-utils; they can then be removed from there and > added to other packages incrementally (probably post-update.1). Good idea. Here follows updated patch for the kernel spec file, tested by installing and removing the package on a running system with no mkinitrd. I wonder if it may be a good idea to also add the commands to fix /versions/running/boot, so it's one less pitfall people can fall into when installing custom kernels. >From 2d6964068e7c8abfe2bc138eafe094f94ea8f9d7 Mon Sep 17 00:00:00 2001 From: Bernardo Innocenti <[EMAIL PROTECTED]> Date: Mon, 17 Dec 2007 07:41:50 +0100 Subject: [PATCH] Replace use of new-kernel-pkg in post scriptlet with direct invocation of depmod Organization: One Laptop Per Child --- SPECS/olpc-2.6.spec | 16 ++-------------- 1 files changed, 2 insertions(+), 14 deletions(-) diff --git a/SPECS/olpc-2.6.spec b/SPECS/olpc-2.6.spec index 2f215ea..b82f396 100644 --- a/SPECS/olpc-2.6.spec +++ b/SPECS/olpc-2.6.spec @@ -972,22 +972,10 @@ rm -rf $RPM_BUILD_ROOT ### %post -if [ `uname -i` == "x86_64" -o `uname -i` == "i386" ]; then - if [ -f /etc/sysconfig/kernel ]; then - /bin/sed -i -e 's/^DEFAULTKERNEL=kernel-smp$/DEFAULTKERNEL=kernel/' /etc/sysconfig/kernel || exit $? - fi -fi -if [ -x /usr/sbin/module_upgrade ] -then - /usr/sbin/module_upgrade %{rpmversion}-%{release} || exit $? -fi -/sbin/new-kernel-pkg --package kernel --depmod --install %{KVERREL} || exit $? +/sbin/depmod -ae -F /boot/System.map-%{KVERREL} %{KVERREL} if [ -f /boot/vmlinuz-%{KVERREL} ]; then (cd /boot && ln -sf vmlinuz-%{KVERREL} vmlinuz) fi -if [ -f /boot/initrd-%{KVERREL}.img ]; then - (cd /boot && ln -sf initrd-%{KVERREL}.img initrd.img) -fi %post devel if [ -f /etc/sysconfig/kernel ] @@ -1105,7 +1093,7 @@ if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then fi %preun -/sbin/new-kernel-pkg --rmmoddep --remove %{KVERREL} || exit $? +[ -d /lib/modules/%{KVERREL} ] && rm -f /lib/modules/%{KVERREL}/modules.* %preun smp /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}smp || exit $? -- 1.5.3.3 -- \___/ |___| Bernardo Innocenti - http://www.codewiz.org/ \___\ One Laptop Per Child - http://www.laptop.org/ _______________________________________________ Devel mailing list [email protected] http://lists.laptop.org/listinfo/devel
