summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2017-02-21 11:48:08 (GMT)
committerTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2017-02-21 11:48:08 (GMT)
commitf7a8deb3081672c22799f1ce4fca2d96c71f0caa (patch)
treee832b0dee8ae4118c2d060af8a2a868b63caa955
parent409a4ce5847777770f8b2f1772fb52fc4ea2a151 (diff)
downloaddefinitions-f7a8deb3081672c22799f1ce4fca2d96c71f0caa.tar.gz
Incoprorating /usr merge effected in upstream baserock
-rw-r--r--build-essential/fhs-dirs.bst2
-rw-r--r--build-essential/stage2-fhs-dirs.bst6
2 files changed, 4 insertions, 4 deletions
diff --git a/build-essential/fhs-dirs.bst b/build-essential/fhs-dirs.bst
index 1a25b0a..197d6e9 100644
--- a/build-essential/fhs-dirs.bst
+++ b/build-essential/fhs-dirs.bst
@@ -4,7 +4,7 @@ sources:
- kind: git
url: baserock:baserock/fhs-dirs
track: master
- ref: 1218cbd38a4f4e9da75af6f7fae946ca92666afb
+ ref: 9fafca436000bb57ddd5c498f8a75ea7b274f6c5
depends:
- filename: build-essential/stage2.bst
diff --git a/build-essential/stage2-fhs-dirs.bst b/build-essential/stage2-fhs-dirs.bst
index 80ce42f..9d07d9a 100644
--- a/build-essential/stage2-fhs-dirs.bst
+++ b/build-essential/stage2-fhs-dirs.bst
@@ -4,7 +4,7 @@ sources:
- kind: git
url: baserock:baserock/fhs-dirs
track: master
- ref: 1218cbd38a4f4e9da75af6f7fae946ca92666afb
+ ref: 9fafca436000bb57ddd5c498f8a75ea7b274f6c5
depends:
- filename: build-essential/stage1.bst
@@ -19,8 +19,8 @@ environment:
config:
install-commands:
- sh ./create-fhs-dirs "%{install-root}"
- - rmdir "%{install-root}/bin"
- - ln -s "%{prefix}/bin" "%{install-root}/bin"
+ - rmdir "%{install-root}/usr/bin"
+ - ln -s "%{prefix}/bin" "%{install-root}/usr/bin"
- install -m 644 passwd "%{install-root}/etc/passwd"
- install -m 600 shadow "%{install-root}/etc/shadow"
- install -m 644 interfaces "%{install-root}/etc/network/interfaces"