summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-03-14 16:16:47 (GMT)
committerRichard Maw <richard.maw@codethink.co.uk>2014-03-14 16:16:47 (GMT)
commit0d50fc299e0072cd56ac7804b54a6c137c501855 (patch)
tree3803e88fee4fe934802461d6185b7574f24fce67
parentf0132ba6569ea66ae28c09dfa8b80238d45958cd (diff)
parentef42af3aeca307d216a7a42eadf3ef05899ba49a (diff)
downloaddefinitions-0d50fc299e0072cd56ac7804b54a6c137c501855.tar.gz
Merge branch 'baserock/richardmaw/S10692-sdk-sysroot'
Reviewed-by: Daniel Silverstone <daniel.silverstone@codethink.co.uk> Reviewed-by: Lars Wirzenius <lars.wirzenius@codethink.co.uk>
-rw-r--r--sdk.morph6
-rwxr-xr-xsdk.write2
2 files changed, 7 insertions, 1 deletions
diff --git a/sdk.morph b/sdk.morph
index 0c72f26..c7eb3e4 100644
--- a/sdk.morph
+++ b/sdk.morph
@@ -10,3 +10,9 @@ systems:
location: armv7lhf-cross-toolchain-system-x86_32-generic.sh
PREFIX: /usr
TARGET: armv7lhf-baserock-linux-gnueabi
+ subsystems:
+ - morph: devel-system-armv7lhf-highbank
+ deploy:
+ sysroot:
+ type: sysroot
+ location: usr/armv7lhf-baserock-linux-gnueabi/sys-root
diff --git a/sdk.write b/sdk.write
index 4a9703a..83ed54d 100755
--- a/sdk.write
+++ b/sdk.write
@@ -178,7 +178,7 @@ extract_rootfs(){
local selfextractor="$1"
local target="$2"
local script_end="$(($(\
- grep -En -m1 -e '^#+ END OF HEADER SCRIPT #+$' "$selfextractor" |
+ grep -aEn -m1 -e '^#+ END OF HEADER SCRIPT #+$' "$selfextractor" |
cut -d: -f1) + 1 ))"
mkdir -p "$target"
tail -n +"$script_end" "$selfextractor" | tar -xj -C "$target" .