[oe-commits] John Lee : fastboot: initscripts-openmoko: use OE alignment.sh iff arm.

[GIT User account]

Module: openembedded.git
Branch: john_lee/fastboot-devel
Commit: c41592d330529d4503d653c551f01c694d53aac1
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=c41592d330529d4503d653c551f01c694d53aac1

Author: John Lee <john_lee at openmoko.org>
Date:   Tue Dec 23 21:16:18 2008 +0800

fastboot: initscripts-openmoko: use OE alignment.sh iff arm.

* move OE alignment.sh to public 'files' dir
* remove the OM one.
* modify initscripts-openmoko_1.0.bb to use it only in arm arch.

---

 .../{initscripts-1.0 => files}/arm/alignment.sh    |    0 
 .../initscripts/initscripts-openmoko/alignment.sh  |    6 ------
 packages/initscripts/initscripts-openmoko_1.0.bb   |   15 +++++++++------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/packages/initscripts/initscripts-1.0/arm/alignment.sh b/packages/initscripts/files/arm/alignment.sh
similarity index 100%
rename from packages/initscripts/initscripts-1.0/arm/alignment.sh
rename to packages/initscripts/files/arm/alignment.sh
diff --git a/packages/initscripts/initscripts-openmoko/alignment.sh b/packages/initscripts/initscripts-openmoko/alignment.sh
deleted file mode 100644
index 4a66dc6..0000000
--- a/packages/initscripts/initscripts-openmoko/alignment.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ -e /proc/cpu/alignment ]; then
-   echo "3" > /proc/cpu/alignment
-fi
-
diff --git a/packages/initscripts/initscripts-openmoko_1.0.bb b/packages/initscripts/initscripts-openmoko_1.0.bb
index 7ac54a0..d6d233b 100644
--- a/packages/initscripts/initscripts-openmoko_1.0.bb
+++ b/packages/initscripts/initscripts-openmoko_1.0.bb
@@ -5,12 +5,9 @@ LICENSE = "GPL"
 DEPENDS = ""
 RDEPENDS = ""
 
-RPROVIDES_${PN} = "initscripts"
 RCONFLICTS_${PN} = "initscripts"
-RREPLACES_${PN} = "initscripts"
 
-SRC_URI = "file://alignment.sh \
-	   file://bootmisc.sh \
+SRC_URI = "file://bootmisc.sh \
 	   file://campgsm \
 	   file://checkroot.sh \
 	   file://finish.sh \
@@ -33,6 +30,8 @@ SRC_URI = "file://alignment.sh \
 	   file://umountnfs.sh \
 	   "
 
+SRC_URI_append_arm = " file://alignment.sh"
+
 inherit base
 
 do_install () {
@@ -51,7 +50,9 @@ do_install () {
 	install -d ${D}${sysconfdir}/default
 	install -d ${D}${sysconfdir}/default/volatiles
 
-	install -m 0755	${WORKDIR}/alignment.sh		${D}${sysconfdir}/init.d
+	if [ "${TARGET_ARCH}" = "arm" ]; then
+		install -m 0755 ${WORKDIR}/alignment.sh	${D}${sysconfdir}/init.d
+	fi
 	install -m 0755	${WORKDIR}/bootmisc.sh		${D}${sysconfdir}/init.d
 	install -m 0755	${WORKDIR}/campgsm		${D}${sysconfdir}/init.d
 	install -m 0755	${WORKDIR}/checkroot.sh		${D}${sysconfdir}/init.d
@@ -82,7 +83,9 @@ do_install () {
 	ln -sf		../init.d/hostname.sh		${D}${sysconfdir}/rcS.d/S02hostname.sh
 	ln -sf		../init.d/mountkernfs.sh	${D}${sysconfdir}/rcS.d/S02mountkernfs.sh
 	ln -sf		../init.d/mountdevsubfs.sh	${D}${sysconfdir}/rcS.d/S04mountdevsubfs.sh
-	ln -sf		../init.d/alignment.sh		${D}${sysconfdir}/rcS.d/S06alignment.sh
+	if [ "${TARGET_ARCH}" = "arm" ]; then
+		ln -sf	../init.d/alignment.sh		${D}${sysconfdir}/rcS.d/S06alignment
+	fi
 	#ln -sf		../init.d/campgsm		${D}${sysconfdir}/rcS.d/S07campgsm
 	ln -sf		../init.d/checkroot.sh		${D}${sysconfdir}/rcS.d/S10checkroot.sh
 	ln -sf		../init.d/mountall.sh		${D}${sysconfdir}/rcS.d/S35mountall.sh