From f7a8deb3081672c22799f1ce4fca2d96c71f0caa Mon Sep 17 00:00:00 2001 From: Tristan Van Berkom Date: Tue, 21 Feb 2017 20:48:08 +0900 Subject: Incoprorating /usr merge effected in upstream baserock --- build-essential/fhs-dirs.bst | 2 +- build-essential/stage2-fhs-dirs.bst | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-essential/fhs-dirs.bst b/build-essential/fhs-dirs.bst index 1a25b0a4..197d6e96 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 80ce42f4..9d07d9a2 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" -- cgit v1.2.1