agl-basesystem 0.1sandbox/ToshikazuOhiwa/master

1 files changed, 19 insertions, 26 deletions

diff --git a/meta-agl/meta-agl-basesystem/classes/agl-basesystem-capability.bbclass b/meta-agl/meta-agl-basesystem/classes/agl-basesystem-capability.bbclass
index 3170cc9c..542601e7 100644
--- a/meta-agl/meta-agl-basesystem/classes/agl-basesystem-capability.bbclass
+++ b/meta-agl/meta-agl-basesystem/classes/agl-basesystem-capability.bbclass
@@ -1,32 +1,25 @@
 pkg_postinst_ontarget_${PN}_append () {
-df / --exclude-type=nfs > /dev/null
-IS_EMMC_BOOT=$?
-  
-if [ $IS_EMMC_BOOT -eq 0 ]; then
     CAPVARS="${CAPABILITY}"
     IFS=" "
-    for cap in $CAPVARS; do
-        capability=`echo $cap | cut -f 1 -d ":"`
-        file=`echo $cap | cut -f 2 -d ":"`
-        setcap $capability $D$file
-    done
-else
-    CAPVARS="${CAPABILITY}"
-    IFS=" "
-    for cap in $CAPVARS; do
-        capability=`echo $cap | cut -f 1 -d ":"`
-        file=`echo $cap | cut -f 2 -d ":"`
-        TCAP_NAME="/tmp/${file##*/}"
-        if [ ! -L ${file} ]; then
-                cp -a ${file} ${TCAP_NAME}
-                mv ${file} ${file}.org
-                ln -fs ${TCAP_NAME} ${file}
-        else
-                cp -a ${file}.org ${TCAP_NAME}
-        fi
-                setcap ${capability} ${TCAP_NAME}
+    for cap in ${CAPVARS}; do
+        capability=`echo ${cap} | cut -f 1 -d ":"`
+        file=`echo ${cap} | cut -f 2 -d ":"`
+        setcap ${capability} $D${file}
+
+	df -T / | grep nfs > /dev/null
+	IS_EMMC_BOOT=$?
+	if [ $IS_EMMC_BOOT -eq 0 ]; then
+		TCAP_NAME="/tmp/${file##*/}"
+		if [ ! -L ${file} ]; then
+		        cp -a ${file} ${TCAP_NAME}
+		        mv ${file} ${file}.org
+		        ln -fs ${TCAP_NAME} ${file}
+		else
+		        cp -a ${file}.org ${TCAP_NAME}
+		fi
+		setcap ${capability} ${TCAP_NAME}
+	fi
      done
-fi
 }
 #RDEPENDS_${PN} += "libcap-bin"
-PACKAGE_WRITE_DEPS = "libcap-native"
+PACKAGE_WRITE_DEPS = "libcap-native coreutils-native"