/sbin/ldconfig
# Check 3-touchkey firmware
-/lib/firmware/firmware_upgrade_touchkey.sh
+#/lib/firmware/firmware_upgrade_touchkey.sh
#Check machine is P1P2
MACHINE=`grep Hardware /proc/cpuinfo|cut -d ":" -f 2|tr -d " "`
-if [ $MACHINE == "P1P2" ];then
+if [ $MACHINE -eq "P1P2" ];then
ln -s /opt/etc/X11/xorg.conf.d.p1p2 /opt/etc/X11/xorg.conf.d
# motor sensor has not been implemented yet
rm -f /usr/driver/tspdrv.ko
mkdir -p /opt/etc/sound
fi
-if [ $MACHINE == "F1" ]; then
+if [ $MACHINE -eq "F1" ]; then
cp -r /usr/share/ascenario/mc1n2 /opt/etc/sound/default
cp -r /usr/share/ascenario/mc1n2.conf /opt/etc/sound/default.conf
else
--- /dev/null
+From 589cb1f0a6dc3ee714e7bdc0beb6d0e3a68fdbd3 Mon Sep 17 00:00:00 2001
+From: Chengwei Yang <chengwei.yang@intel.com>
+Date: Wed, 5 Sep 2012 18:37:15 +0800
+Subject: [PATCH] Fix doesn't remount / as rw when bootup
+
+When boot up, rc.sysinit doesn't remount / as rw because ionice wasn't
+installed. There is already a workaround in image-configurations-mobile
+and the workaround will be removed after this patch got merged.
+
+Change-Id: Ief0fb5b0ee008a9ea69e1f8fe630375ff44c829f
+Signed-off-by: Chengwei Yang <chengwei.yang@intel.com>
+---
+ etc/rc.d/rc.sysinit | 6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/etc/rc.d/rc.sysinit b/etc/rc.d/rc.sysinit
+index bca14c3..7a74a65 100755
+--- a/etc/rc.d/rc.sysinit
++++ b/etc/rc.d/rc.sysinit
+@@ -35,7 +35,11 @@ remount_needed() {
+
+ # Remount the root filesystem read-write.
+ if remount_needed ; then
+- ionice -t -c 1 -n 0 mount -n -o remount,rw /
++ if which ionice; then
++ ionice -t -c 1 -n 0 mount -n -o remount,rw /
++ else
++ mount -n -o remount,rw /
++ fi
+ fi
+
+
+--
+1.7.7
+* Sat Nov 3 01:14:36 UTC 2012 - tracy.graydon@intel.com
+- Fix a couple of issues in rc.firstboot causing funky errors on start up.
+- Add rc.emul and rc.network explicitly to spec
+
* Thu Aug 09 2012 Arron <arron.wang@intel.com>
- Add Tizen wifi port script, due to we don't need load/unload wifi
- driver in the script, we just keep it empty
Group: System/Base
Release: 1
Source: %{name}-%{version}.tar.bz2
+Patch0: fix-remount.patch
Source1001: packaging/system-plugin-ia-generic.manifest
# >> gbp-patch-tags # auto-added by gbp
# << gbp-patch-tags # auto-added by gbp
%setup -q
# >> gbp-apply-patches # auto-added by gbp
# << gbp-apply-patches # auto-added by gbp
+%patch0 -p1
%build
cp %{SOURCE1001} .
cp -a usr %{buildroot}
-
-
%files
%manifest system-plugin-ia-generic.manifest
/etc/fstab
/etc/rc.d/rc.leavesleep
/etc/rc.d/rc.shutdown
/etc/rc.d/rc.sysinit
-/etc/rc.d/rc.*
+/etc/rc.d/rc.emul
+/etc/rc.d/rc.network
/usr/bin/wlan.sh