Skip to contentSkip to conversation

scripts/cleanup-workdir: fix after binutils-cross name change

PATCH In review Stefan Stanacar 2 participants 2 messages May 4, 2014 – May 5, 2014

lore
Share & tools
lore

Stefan Stanacar

author
#0 lore raw

PATCH 1/1 scripts/cleanup-workdir: fix after binutils-cross name change

Signed-off-by Stefan Stanacar <[email protected]>
---
 scripts/cleanup-workdir | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
scripts/cleanup-workdir +3 -2
index 25fef97..cffac59 100755
@@ -49,9 +49,10 @@ def run_command(cmd):
 
 def get_cur_arch_dirs(workdir, arch_dirs):
     pattern = workdir + '/(.*?)/'
-
+    tunearch = run_command("bitbake -e | grep ^TUNE_ARCH=")
+    tunearch = tunearch.split('"')[1]
     # select thest 5 packages to get the dirs of current arch
-    pkgs = ['hicolor-icon-theme', 'base-files', 'acl-native', 'binutils-crosssdk', 'nativesdk-autoconf']
+    pkgs = ['hicolor-icon-theme', 'base-files', 'acl-native', 'binutils-crosssdk-' + tunearch, 'nativesdk-autoconf']
 
     for pkg in pkgs:
         cmd = "bitbake -e " + pkg + " | grep ^IMAGE_ROOTFS="
Signature · 1 line
1.9.0
#1 lore raw
Quoted 12 lines · Stefan Stanacar
Signed-off-by Stefan Stanacar <[email protected]>
---
 scripts/cleanup-workdir | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
scripts/cleanup-workdir +0 -0
index 25fef97..cffac59 100755
@@ -49,9 +49,10 @@ def run_command(cmd):
 
 def get_cur_arch_dirs(workdir, arch_dirs):

scripts/cleanup-workdir def run_command(cmd): · line 58

Quoted 10 lines
scripts/cleanup-workdir +3 -2
     pattern = workdir + '/(.*?)/'
-
+    tunearch = run_command("bitbake -e | grep ^TUNE_ARCH=")
+    tunearch = tunearch.split('"')[1]
     # select thest 5 packages to get the dirs of current arch
-    pkgs = ['hicolor-icon-theme', 'base-files', 'acl-native', 'binutils-crosssdk', 'nativesdk-autoconf']
+    pkgs = ['hicolor-icon-theme', 'base-files', 'acl-native', 'binutils-crosssdk-' + tunearch, 'nativesdk-autoconf']
 
     for pkg in pkgs:
         cmd = "bitbake -e " + pkg + " | grep ^IMAGE_ROOTFS="

I pushed a fix for this before I saw the patch. FWIW for crosssdk we need to use SDK_ARCH though.

Cheers,

Richard