GitHub-Mirror/build
2
0
Fork 0
mirror of https://github.com/Fishwaldo/build.git synced 2025-06-28 17:19:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Enhancement for overlay compilation

Browse source
This commit is contained in:
zador-blood-stained 2016-10-31 20:05:24 +03:00
parent e2596cf8bf
commit ca29e8b7c2
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common.sh
View file

@ -425,10 +425,11 @@ userpatch_create()
for i in {3..1..1}; do echo -n "$i." && sleep 1; done for i in {3..1..1}; do echo -n "$i." && sleep 1; done
} }
# overlayfs_wrapper <operation> <workdir> # overlayfs_wrapper <operation> <workdir> <description>
# #
# <operation>: wrap|cleanup # <operation>: wrap|cleanup
# <workdir>: path to source directory # <workdir>: path to source directory
# <description>: suffix for merged directory to help locating it in /tmp
# return value: new directory # return value: new directory
# #
# Assumptions/notes: # Assumptions/notes:
@ -447,9 +448,10 @@ overlayfs_wrapper()
local operation="$1" local operation="$1"
if [[ $operation == wrap ]]; then if [[ $operation == wrap ]]; then
local srcdir="$2" local srcdir="$2"
local description="$3"
local tempdir=$(mktemp -d) local tempdir=$(mktemp -d)
local workdir=$(mktemp -d) local workdir=$(mktemp -d)
local mergeddir=$(mktemp -d) local mergeddir=$(mktemp -d --suffix="_$description")
mount -t overlay overlay -o lowerdir="$srcdir",upperdir="$tempdir",workdir="$workdir" "$mergeddir" mount -t overlay overlay -o lowerdir="$srcdir",upperdir="$tempdir",workdir="$workdir" "$mergeddir"
# this is executed in a subshell, so use temp files to pass extra data outside # this is executed in a subshell, so use temp files to pass extra data outside
echo "$tempdir" >> /tmp/.overlayfs_wrapper_cleanup echo "$tempdir" >> /tmp/.overlayfs_wrapper_cleanup

4
main.sh
View file

@ -206,7 +206,7 @@ if [[ ! -f $DEST/debs/${CHOSEN_UBOOT}_${REVISION}_${ARCH}.deb ]]; then
find_toolchain "UBOOT" "$UBOOT_NEEDS_GCC" "UBOOT_TOOLCHAIN" find_toolchain "UBOOT" "$UBOOT_NEEDS_GCC" "UBOOT_TOOLCHAIN"
fi fi
compile_uboot $(overlayfs_wrapper "wrap" "$SOURCES/$BOOTSOURCEDIR") compile_uboot $(overlayfs_wrapper "wrap" "$SOURCES/$BOOTSOURCEDIR" "u-boot_${LINUXFAMILY}_${BRANCH}")
fi fi
# Compile kernel if packed .deb does not exist # Compile kernel if packed .deb does not exist
@ -217,7 +217,7 @@ if [[ ! -f $DEST/debs/${CHOSEN_KERNEL}_${REVISION}_${ARCH}.deb ]]; then
find_toolchain "KERNEL" "$KERNEL_NEEDS_GCC" "KERNEL_TOOLCHAIN" find_toolchain "KERNEL" "$KERNEL_NEEDS_GCC" "KERNEL_TOOLCHAIN"
fi fi
compile_kernel $(overlayfs_wrapper "wrap" "$SOURCES/$LINUXSOURCEDIR") compile_kernel $(overlayfs_wrapper "wrap" "$SOURCES/$LINUXSOURCEDIR" "kernel_${LINUXFAMILY}_${BRANCH}")
fi fi
overlayfs_wrapper "cleanup" overlayfs_wrapper "cleanup"