Fix packaging to be consistent with Tizen guidelines

Applying patch that was previously added to the packaging
directory and then cleaning up the spec file to no longer
attempt to apply the removed patch file.  Do not add patches
to the packaging/ directory.  This misses the entire point
of using git for system packaging instead of the old approach
of maintaining a set of patch files.

diff --git a/etc/rc.d/rc.sysinit b/etc/rc.d/rc.sysinit
index bca14c3..7a74a65 100755 (executable)
--- 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
 
 

diff --git a/packaging/fix-remount.patch b/packaging/fix-remount.patch
deleted file mode 100644 (file)
index 102e1a2..0000000
--- a/packaging/fix-remount.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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

diff --git a/packaging/system-plugin-ia-generic.spec b/packaging/system-plugin-ia-generic.spec
index a6458c0..74b4702 100644 (file)
--- a/packaging/system-plugin-ia-generic.spec
+++ b/packaging/system-plugin-ia-generic.spec
@@ -5,10 +5,7 @@ License: TO BE FILLED IN
 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
 Requires: udev
 ExclusiveArch: %ix86 x86_64
 
@@ -18,9 +15,6 @@ Startup files
 
 %prep
 %setup -q
-# >> gbp-apply-patches    # auto-added by gbp
-# << gbp-apply-patches    # auto-added by gbp
-%patch0 -p1
 
 %build
 cp %{SOURCE1001} .