refactor build script
1. remove unnecessary download in build.sh
2. set workdir in build_in_container.sh to get build artifacts
Bug: n/a
Test: build
Change-Id: Ic817d3e5d5d2c371113220f61a536f75267e713e
diff --git a/build/debian/build.sh b/build/debian/build.sh
index af5084b..0d13019 100755
--- a/build/debian/build.sh
+++ b/build/debian/build.sh
@@ -84,22 +84,12 @@
DEBIAN_FRONTEND=noninteractive \
apt install --no-install-recommends --assume-yes "${packages[@]}"
-
if [ ! -f $"HOME"/.cargo/bin/cargo ]; then
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
fi
source "$HOME"/.cargo/env
rustup target add "${arch}"-unknown-linux-gnu
-
- sed -i s/losetup\ -f/losetup\ -P\ -f/g /usr/sbin/fai-diskimage
- sed -i 's/wget \$/wget -t 0 \$/g' /usr/share/debootstrap/functions
-
- apt install --no-install-recommends --assume-yes curl
- # just for testing
- echo "libseccomp: $(curl -is https://deb.debian.org/debian/pool/main/libs/libseccomp/libseccomp2_2.5.4-1+deb12u1_"${debian_arch}".deb | head -n 1)"
- echo "libsemanage-common: $(curl -is https://deb.debian.org/debian/pool/main/libs/libsemanage/libsemanage-common_3.4-1_all.deb | head -n 1)"
- echo "libpcre2: $(curl -is https://deb.debian.org/debian/pool/main/p/pcre2/libpcre2-8-0_10.42-1_"${debian_arch}".deb | head -n 1)"
}
download_debian_cloud_image() {
diff --git a/build/debian/build_in_container.sh b/build/debian/build_in_container.sh
index 555ce90..fd1a975 100755
--- a/build/debian/build_in_container.sh
+++ b/build/debian/build_in_container.sh
@@ -19,6 +19,6 @@
esac
done
-docker run --privileged -it -v \
+docker run --privileged -it --workdir /root/Virtualization/build/debian -v \
"$ANDROID_BUILD_TOP/packages/modules/Virtualization:/root/Virtualization" -v \
/dev:/dev ubuntu:22.04 /root/Virtualization/build/debian/build.sh -a "$arch"