Restore default directory layout
This commit is contained in:
parent
c32ad3e76e
commit
0b8308e9d1
|
@ -91,13 +91,6 @@ in
|
||||||
|
|
||||||
patchPhase = ''
|
patchPhase = ''
|
||||||
patchShebangs .
|
patchShebangs .
|
||||||
|
|
||||||
substituteInPlace cmake/zephyr/host-tools.cmake \
|
|
||||||
--replace "/usr/share" "/share" \
|
|
||||||
--replace "/sysroots/\*-pokysdk-linux" ""
|
|
||||||
|
|
||||||
substituteInPlace cmake/Zephyr-sdkConfig.cmake \
|
|
||||||
--replace ".. ABSOLUTE" "../.. ABSOLUTE"
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
dontConfigure = true;
|
dontConfigure = true;
|
||||||
|
@ -106,25 +99,8 @@ in
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
|
|
||||||
mkdir -p $out/{share,lib}
|
mkdir -p $out
|
||||||
|
mv * $out
|
||||||
# remove deprecated symbolic links
|
|
||||||
find ./sysroots/$(uname -m)-pokysdk-linux/usr/bin -type l -exec unlink {} \;
|
|
||||||
|
|
||||||
# add zephyr-sdk standalone hosttools
|
|
||||||
mv ./sysroots/$(uname -m)-pokysdk-linux/usr/{bin,libexec,share} $out/
|
|
||||||
mv ./sysroots/$(uname -m)-pokysdk-linux/usr/synopsys/bin/qemu-system-* $out/bin/
|
|
||||||
mv ./sysroots/$(uname -m)-pokysdk-linux/usr/xilinx/bin/qemu-system-aarch64 \
|
|
||||||
$out/bin/qemu-system-xilinx-aarch64
|
|
||||||
mv ./sysroots/$(uname -m)-pokysdk-linux/usr/xilinx/bin/qemu-system-microblazeel \
|
|
||||||
$out/bin/qemu-system-xilinx-microblazeel
|
|
||||||
|
|
||||||
# add zephyr-sdk cmake modules
|
|
||||||
mv ./cmake $out/lib/cmake
|
|
||||||
mv ./sdk_* $out/lib
|
|
||||||
|
|
||||||
# add zephyr-sdk cross compilers
|
|
||||||
mv ./*zephyr*/bin/* $out/bin/
|
|
||||||
|
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
addZephyrSDKCEnvVars() {
|
addZephyrSDKCEnvVars() {
|
||||||
export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
|
export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
|
||||||
export ZEPHYR_SDK_INSTALL_DIR=@out@
|
export ZEPHYR_SDK_INSTALL_DIR=@out@
|
||||||
export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:@out@/lib/cmake/
|
|
||||||
}
|
}
|
||||||
|
|
||||||
addEnvHooks "$hostOffset" addZephyrSDKCEnvVars
|
addEnvHooks "$hostOffset" addZephyrSDKCEnvVars
|
||||||
|
|
Loading…
Reference in a new issue