From 8cf17b70cbd1a769cccd0d0ab494ed3808608815 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 15 Jan 2014 13:43:01 +0000
Subject: main/mkinifs: fix trigger script to use unversioned kernel images

We now create unversioned kernel images so we must not overwrite those
with a symlink.

Let also update-extlinux deal with extlinux.conf
---
 main/mkinitfs/APKBUILD         |  2 +-
 main/mkinitfs/mkinitfs.trigger | 20 +-------------------
 2 files changed, 2 insertions(+), 20 deletions(-)

(limited to 'main/mkinitfs')

diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD
index 93d823512..e2d76a802 100644
--- a/main/mkinitfs/APKBUILD
+++ b/main/mkinitfs/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=mkinitfs
 pkgver=2.5.3
 _ver=${pkgver%_git*}
-pkgrel=0
+pkgrel=1
 pkgdesc="Tool to generate initramfs images for Alpine"
 url=http://git.alpinelinux.org/cgit/mkinitfs
 depends="busybox apk-tools>=2.0"
diff --git a/main/mkinitfs/mkinitfs.trigger b/main/mkinitfs/mkinitfs.trigger
index 4069d923f..bee6c0a01 100644
--- a/main/mkinitfs/mkinitfs.trigger
+++ b/main/mkinitfs/mkinitfs.trigger
@@ -11,26 +11,8 @@ for i in "$@"; do
 		continue
 	fi
 	abi_release=$(cat "$i"/kernel.release)
-	initfs=initramfs-$abi_release
+	initfs=initramfs-$flavor
 	mkinitfs -o /boot/$initfs $abi_release
-	ln -sf $initfs /boot/initramfs-$flavor
-	ln -sf vmlinuz-$abi_release /boot/vmlinuz-$flavor
-
-	#this is for compat. to be removed eventually...
-	ln -sf vmlinuz-$flavor /boot/$flavor
-	ln -sf initramfs-$flavor /boot/$flavor.gz
-	ln -sf /boot/vmlinuz-$flavor /$flavor
-	ln -sf /boot/initramfs-$flavor /$flavor.gz
-
-	# Update the /boot/extlinux.conf to point to correct kernel
-	f=/boot/extlinux.conf
-	if [ -f $f ] && grep -q -- "kernel /$flavor" $f; then
-		sed -i -e "s:kernel /$flavor:kernel /boot/vmlinuz-$flavor:" \
-		  -e "s:initrd=/$flavor.gz:initrd=/boot/initramfs-$flavor:" \
-		  -e "s:initrd /$flavor.gz:initrd /boot/initramfs-$flavor:" \
-		  $f
-	fi
-
 done
 
 # extlinux will use path relative partition, so if /boot is on a
-- 
cgit v1.2.3