Fix custom tmp dir build

Fix 
This commit is contained in:
Howard Wu 2023-07-07 03:13:36 +08:00
parent 88bd8894d9
commit d9798874c0

View file

@ -28,7 +28,7 @@ if [ "$HOST_ARCH" != "x86_64" ] && [ "$HOST_ARCH" != "aarch64" ]; then
exit 1
fi
cd "$(dirname "$0")" || exit 1
# export TMPDIR=$(dirname "$PWD")/WORK_DIR_
# export TMPDIR=$HOME/.cache/wsa
if [ "$TMPDIR" ] && [ ! -d "$TMPDIR" ]; then
mkdir -p "$TMPDIR"
fi
@ -170,7 +170,6 @@ mk_overlayfs() { # label lowerdir upperdir merged
upperdir=$upperdir
workdir=$workdir
merged=$merged"
sudo mkdir -p -m 755 "$workdir" "$upperdir" "$merged"
case "$1" in
vendor)
context="u:object_r:vendor_file:s0"
@ -185,11 +184,12 @@ mk_overlayfs() { # label lowerdir upperdir merged
own="0:0"
;;
esac
sudo chown -R "$own" "$upperdir" "$workdir" "$merged"
sudo setfattr -n security.selinux -v "$context" "$upperdir"
sudo setfattr -n security.selinux -v "$context" "$workdir"
sudo setfattr -n security.selinux -v "$context" "$merged"
sudo mount -vt overlay overlay -olowerdir="$lowerdir",upperdir="$upperdir",workdir="$workdir" "$merged"
sudo mkdir -p -m 755 "$workdir" "$upperdir" "$merged" || return 1
sudo chown -R "$own" "$upperdir" "$workdir" "$merged" || return 1
sudo setfattr -n security.selinux -v "$context" "$upperdir" || return 1
sudo setfattr -n security.selinux -v "$context" "$workdir" || return 1
sudo setfattr -n security.selinux -v "$context" "$merged" || return 1
sudo mount -vt overlay overlay -olowerdir="$lowerdir",upperdir="$upperdir",workdir="$workdir" "$merged" || return 1
}
mk_erofs_umount() { # dir imgpath upperdir
@ -844,10 +844,10 @@ if [ "$GAPPS_BRAND" != 'none' ]; then
echo "Integrate $GAPPS_BRAND"
find "$WORK_DIR/gapps/" -mindepth 1 -type d -exec sudo chmod 0755 {} \;
find "$WORK_DIR/gapps/" -mindepth 1 -type d -exec sudo chown root:root {} \;
file_list="$(find "$WORK_DIR/gapps/" -mindepth 1 -type f | cut -d/ -f5-)"
file_list="$(find "$WORK_DIR/gapps/" -mindepth 1 -type f)"
for file in $file_list; do
sudo chown root:root "$WORK_DIR/gapps/${file}"
sudo chmod 0644 "$WORK_DIR/gapps/${file}"
sudo chown root:root "$file"
sudo chmod 0644 "$file"
done
if [ "$GAPPS_BRAND" = "OpenGApps" ]; then