From 58cc10351e696c45f2a9ef4fe54d7e6a2c7436d9 Mon Sep 17 00:00:00 2001
From: Alejandro Mery <amery@opensde.org>
Date: Thu, 13 Nov 2008 23:40:38 +0200
Subject: [PATCH] mkinitramfs: changed to install using my beloved
 overlay_apply()

---
 .../30-blocks.sh => install/D%libdir_30-blocks.sh.txt} |  2 +-
 .../50-kernel.sh => install/D%libdir_50-kernel.sh.txt} |  2 +-
 .../D%sbindir_mkinitramfs.sh}                          | 10 +++++-----
 base/mkinitramfs/mkinitramfs.conf                      |  8 +-------
 4 files changed, 8 insertions(+), 14 deletions(-)
 rename base/mkinitramfs/{files/30-blocks.sh => install/D%libdir_30-blocks.sh.txt} (92%)
 rename base/mkinitramfs/{files/50-kernel.sh => install/D%libdir_50-kernel.sh.txt} (96%)
 rename base/mkinitramfs/{mkinitramfs.sh => install/D%sbindir_mkinitramfs.sh} (96%)

diff --git a/base/mkinitramfs/files/30-blocks.sh b/base/mkinitramfs/install/D%libdir_30-blocks.sh.txt
similarity index 92%
rename from base/mkinitramfs/files/30-blocks.sh
rename to base/mkinitramfs/install/D%libdir_30-blocks.sh.txt
index 293345e6a..bcc07abfb 100644
--- a/base/mkinitramfs/files/30-blocks.sh
+++ b/base/mkinitramfs/install/D%libdir_30-blocks.sh.txt
@@ -2,7 +2,7 @@
 # --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
-# Filename: package/.../mkinitramfs/files/30-blocks.sh
+# Filename: package/.../mkinitramfs/install/D%libdir_30-blocks.sh.txt
 # Copyright (C) 2008 The OpenSDE Project
 #
 # More information can be found in the files COPYING and README.
diff --git a/base/mkinitramfs/files/50-kernel.sh b/base/mkinitramfs/install/D%libdir_50-kernel.sh.txt
similarity index 96%
rename from base/mkinitramfs/files/50-kernel.sh
rename to base/mkinitramfs/install/D%libdir_50-kernel.sh.txt
index c8affbbab..0d63f422a 100644
--- a/base/mkinitramfs/files/50-kernel.sh
+++ b/base/mkinitramfs/install/D%libdir_50-kernel.sh.txt
@@ -2,7 +2,7 @@
 # --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
-# Filename: package/.../mkinitramfs/files/50-kernel.sh
+# Filename: package/.../mkinitramfs/install/D%libdir_50-kernel.sh.txt
 # Copyright (C) 2007 - 2008 The OpenSDE Project
 #
 # More information can be found in the files COPYING and README.
diff --git a/base/mkinitramfs/mkinitramfs.sh b/base/mkinitramfs/install/D%sbindir_mkinitramfs.sh
similarity index 96%
rename from base/mkinitramfs/mkinitramfs.sh
rename to base/mkinitramfs/install/D%sbindir_mkinitramfs.sh
index f7d9af709..4f2eea9c0 100644
--- a/base/mkinitramfs/mkinitramfs.sh
+++ b/base/mkinitramfs/install/D%sbindir_mkinitramfs.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
 # --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# 
-# Filename: package/.../mkinitrd/mkinitrd.sh
-# Copyright (C) 2007 The OpenSDE Project
-# 
+#
+# Filename: package/.../mkinitramfs/install/D%sbindir_mkinitramfs.sh
+# Copyright (C) 2007 - 2008 The OpenSDE Project
+#
 # More information can be found in the files COPYING and README.
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; version 2 of the License. A copy of the
diff --git a/base/mkinitramfs/mkinitramfs.conf b/base/mkinitramfs/mkinitramfs.conf
index 30807ffff..d8b48cd42 100644
--- a/base/mkinitramfs/mkinitramfs.conf
+++ b/base/mkinitramfs/mkinitramfs.conf
@@ -20,16 +20,10 @@ makeinstopt=
 
 . $confdir/find_template.in
 
-hook_add postmake 5 'mkinitrd_install'
 if [ -s "$initrd_img" ]; then
 	hook_add postmake 7 "cp -vf '$initrd_img' '$root/boot/initrd.img'"
 else
 	echo_warning "No initrd.img found."
 fi
 
-mkinitrd_install() {
-	install -v -m 755 "$confdir/mkinitramfs.sh" "$root$sbindir/mkinitramfs"
-	for x in $( ls -1d "$confdir/files"/* 2> /dev/null ); do
-		cp -vf "$x" "$root$libdir/"
-	done
-}
+hook_add postmake 5 "overlay_apply '$confdir/install'"