diff options
| author | Waldemar Brodkorb <wbrodkorb@conet.de> | 2015-03-30 13:41:46 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbrodkorb@conet.de> | 2015-03-30 13:41:46 +0200 |
| commit | 92da56c366ec278774544008000a0ead9ba874a1 (patch) | |
| tree | 1ce5d0e853f4bf24189e04573311d86daf917f4b | |
| parent | 897cacf4679f69bb8e224a09366cef274af575f2 (diff) | |
fix rc.conf generation script
| -rwxr-xr-x | scripts/update-rcconf | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/scripts/update-rcconf b/scripts/update-rcconf index 4e816448f..51184b7be 100755 --- a/scripts/update-rcconf +++ b/scripts/update-rcconf @@ -5,12 +5,19 @@ topdir=$(readlink -nf $(dirname $0)/.. 2>/dev/null || (cd $(dirname $0)/..; pwd -P)) . $topdir/.config -if [ -z ${ADK_TARGET_ABI} ];then - rcconf=$topdir/root_${ADK_TARGET_SYSTEM}_${ADK_TARGET_LIBC}_${ADK_TARGET_CPU_ARCH}/etc/rc.conf -else - rcconf=$topdir/root_${ADK_TARGET_SYSTEM}_${ADK_TARGET_LIBC}_${ADK_TARGET_CPU_ARCH}_${ADK_TARGET_ABI}/etc/rc.conf +suffix=${ADK_TARGET_SYSTEM}_${ADK_TARGET_LIBC}_${ADK_TARGET_CPU_ARCH} +if [ ! -z ${ADK_TARGET_FLOAT} ];then + suffix=${suffix}_${ADK_TARGET_FLOAT} +fi +if [ ! -z ${ADK_TARGET_ABI} ];then + suffix=${suffix}_${ADK_TARGET_ABI} +fi +if [ -z ${ADK_TARGET_WITH_MMU} ];then + suffix=${suffix}_nommu fi +rcconf=$(ls $topdir/root_${suffix}/etc/rc.conf) + if [ ! -f $rcconf ];then exit 0 fi @@ -21,6 +28,9 @@ for service in $(grep ^ADK_RUNTIME_START_ $topdir/.config |grep -v ADK_RUNTIME_S rcname=$(echo $rcname| sed -e "s#^BUSYBOX_##") rcname=$(echo $rcname| tr '[:upper:]' '[:lower:]') # workarounds where package name not equal to service name + if [ $rcname = "alsa_utils" ];then + rcname=amixer + fi if [ $rcname = "iptables" ];then rcname=firewall fi |