mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-07-01 09:08:42 +08:00
initfs: adapt to usrmerge
This commit is contained in:
parent
0a475b3d04
commit
f464a6e4b4
@ -24,13 +24,13 @@ elif [ -e ${COOKBOOK_RECIPE}/${TARGET}/init.rc ]; then
|
||||
cp "${COOKBOOK_RECIPE}/${TARGET}/init.rc" "${COOKBOOK_BUILD}/initfs/etc/init.rc"
|
||||
fi
|
||||
|
||||
# Move /usr/bin files to /bin
|
||||
mkdir -p "${COOKBOOK_BUILD}/initfs/bin"
|
||||
if [ -d "${COOKBOOK_BUILD}/initfs/usr/bin" ]
|
||||
then
|
||||
mv "${COOKBOOK_BUILD}/initfs/usr/bin/"* "${COOKBOOK_BUILD}/initfs/bin"
|
||||
rmdir "${COOKBOOK_BUILD}/initfs/usr/bin"
|
||||
fi
|
||||
# Move /usr folders to / and remove links
|
||||
for folder in bin lib include share
|
||||
do
|
||||
rm "${COOKBOOK_BUILD}/initfs/${folder}"
|
||||
mv "${COOKBOOK_BUILD}/initfs/usr/${folder}" "${COOKBOOK_BUILD}/initfs/${folder}"
|
||||
done
|
||||
rmdir "${COOKBOOK_BUILD}/initfs/usr"
|
||||
|
||||
for bin in ${INITFS_RM_BINS}; do
|
||||
rm -f "${COOKBOOK_BUILD}/initfs/bin/$bin"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user