diff --git a/.github/scripts/build-jammy.sh b/.github/scripts/build-udroid.sh similarity index 89% rename from .github/scripts/build-jammy.sh rename to .github/scripts/build-udroid.sh index 43a78e2..9831f07 100755 --- a/.github/scripts/build-jammy.sh +++ b/.github/scripts/build-udroid.sh @@ -6,7 +6,7 @@ export OVERRIDER_COMPRESSION_TYPE export ENABLE_EXIT export ENABLE_USER_SETUP -SUITE="jammy" +SUITE="resolute" frn="out/$SUITE-raw" OVERRIDER_COMPRESSION_TYPE="gzip" ENABLE_EXIT=true @@ -72,17 +72,17 @@ apt-get clean } -do_build "$PREFIX-arm64" arm64 -do_build "$PREFIX-armhf" armhf -do_build "$PREFIX-amd64" amd64 +do_build "latest-test-arm64" arm64 +do_build "latest-test-armhf" armhf +do_build "latest-test-amd64" amd64 -do_compress "$PREFIX-arm64" -do_compress "$PREFIX-armhf" -do_compress "$PREFIX-amd64" +do_compress "latest-test-arm64" +do_compress "latest-test-armhf" +do_compress "latest-test-amd64" -do_unmount "$PREFIX-arm64" -do_unmount "$PREFIX-armhf" -do_unmount "$PREFIX-amd64" +do_unmount "latest-test-arm64" +do_unmount "latest-test-armhf" +do_unmount "latest-test-amd64" shout "setting up artifacts for GitHub" msg "creating $SUITE-{arm64,amd64,armhf} directories" diff --git a/.github/workflows/build-udroid.yml b/.github/workflows/build-udroid.yml index d910d2a..dc9d7ee 100644 --- a/.github/workflows/build-udroid.yml +++ b/.github/workflows/build-udroid.yml @@ -1,46 +1,46 @@ name: build-udroid on: - push: - paths: - - "**.sh" - - "**.yml" - workflow_dispatch: { } + push: + paths: + - "**.sh" + - "**.yml" + workflow_dispatch: {} jobs: - BuidJammyRaw: - name: build Jammy - runs-on: ubuntu-latest - steps: - - name: checkout repo - uses: actions/checkout@v3 - with: - submodules: recursive + BuildTestRaw: + name: build latest + runs-on: ubuntu-latest + steps: + - name: checkout repo + uses: actions/checkout@v3 + with: + submodules: recursive - - name: Docker Setup QEMU - uses: docker/setup-qemu-action@v2 + - name: Docker Setup QEMU + uses: docker/setup-qemu-action@v2 - - name: Satify Dependencies - run: | - sudo apt-get update - sudo apt-get install git build-essential binfmt-support qemu-user-static debootstrap -y + - name: Satify Dependencies + run: | + sudo apt-get update + sudo apt-get install git build-essential binfmt-support qemu-user-static debootstrap -y - - name: Trigger fs-cook - run: sudo bash .github/scripts/build-jammy.sh + - name: Trigger fs-cook + run: sudo bash .github/scripts/build-udroid.sh - - name: save arm64 builds - uses: actions/upload-artifact@v2 - with: - name: jammy-raw-arm64 - path: jammy-arm64 + - name: save arm64 builds + uses: actions/upload-artifact@v4 + with: + name: latest-test-raw-arm64 + path: latest-test-arm64 - - name: save armhf builds - uses: actions/upload-artifact@v2 - with: - name: jammy-raw-armhf - path: jammy-armhf + - name: save armhf builds + uses: actions/upload-artifact@v4 + with: + name: latest-test-raw-armhf + path: latest-test-armhf - - name: save amd64 builds - uses: actions/upload-artifact@v2 - with: - name: jammy-raw-amd64 - path: jammy-amd64 + - name: save amd64 builds + uses: actions/upload-artifact@v4 + with: + name: latest-test-raw-amd64 + path: latest-test-amd64 diff --git a/core/debootstrap-scripts/scripts/oracular b/core/debootstrap-scripts/scripts/oracular new file mode 120000 index 0000000..3840936 --- /dev/null +++ b/core/debootstrap-scripts/scripts/oracular @@ -0,0 +1 @@ +gutsy \ No newline at end of file diff --git a/core/debootstrap-scripts/scripts/plucky b/core/debootstrap-scripts/scripts/plucky new file mode 120000 index 0000000..3840936 --- /dev/null +++ b/core/debootstrap-scripts/scripts/plucky @@ -0,0 +1 @@ +gutsy \ No newline at end of file diff --git a/core/debootstrap-scripts/scripts/questing b/core/debootstrap-scripts/scripts/questing new file mode 120000 index 0000000..3840936 --- /dev/null +++ b/core/debootstrap-scripts/scripts/questing @@ -0,0 +1 @@ +gutsy \ No newline at end of file diff --git a/core/debootstrap-scripts/scripts/resolute b/core/debootstrap-scripts/scripts/resolute new file mode 120000 index 0000000..3840936 --- /dev/null +++ b/core/debootstrap-scripts/scripts/resolute @@ -0,0 +1 @@ +gutsy \ No newline at end of file diff --git a/plugins/envsetup b/plugins/envsetup index fb59d79..971140b 100755 --- a/plugins/envsetup +++ b/plugins/envsetup @@ -56,10 +56,6 @@ if [ "$(id -u)" != "0" ]; then fi fi -if [ -z $ENABLE_USER_SETUP ]; then - export ENABLE_USER_SETUP=false -fi - ROOT_DIR="$(git rev-parse --show-toplevel)" trim_quotes() { @@ -220,8 +216,11 @@ see_for_directory() { no_to_directory() { dir="$1" + if [ -z $NO_DIR_CHECK_OVERRIDE ]; then + export NO_DIR_CHECK_OVERRIDE=false + fi if [ -d "$dir" ]; then - if [ "$NO_DIR_CHECK_OVERRIDE" == "true" ]; then + if $NO_DIR_CHECK_OVERRIDE; then return 0 else die "directory exits: $dir" @@ -248,7 +247,6 @@ includes_packages() { export includes x=0 for item in $includes; do - #include_final="$item" ((x = x + 1)) done shout "$x includes processed " @@ -261,13 +259,13 @@ do_build() { local NO_COMPRESSION - if [ -z "$DISABLE_USER_SETUP" ]; then - export DISABLE_USER_SETUP=false + if [ -z $ENABLE_USER_SETUP ]; then + export ENABLE_USER_SETUP=false fi foreign_arch "$arch" - #Disable cross architecture building in Termux + # disable cross architecture building in Termux if [ "$BUILD_PLATFORM" == "termux" ]; then case $worker_arch in aarch64) termux_arch="arm64" ;; @@ -280,6 +278,7 @@ do_build() { return 0 else lshout "Building on Termux" + dpkg_depends_on debootstrap fi fi @@ -335,7 +334,6 @@ do_build() { fi if [ "$BUILD_PLATFORM" == "termux" ]; then - dpkg_depends_on debootstrap _debootstrap="$(which debootstrap)" FOREIGN="" fi @@ -362,7 +360,7 @@ do_build() { fi fi - if [ "$ENABLE_USER_SETUP" == "true" ]; then + if $ENABLE_USER_SETUP; then setup_user fi @@ -427,12 +425,19 @@ do_qemu_user_emulation() { setup_user() { shout "Setting up user" + [[ -z $FS_USER ]] && warn "no username provided, skipping user setup.." && return 0 + [[ -z $FS_PASS ]] && warn "no password provided, skipping user setup.." && return 0 cp plugins/setup-user.sh $chroot_dir sed -i s/'$FS_USER'/$FS_USER/g $chroot_dir/setup-user.sh sed -i s/'$FS_PASS'/$FS_PASS/g $chroot_dir/setup-user.sh run_cmd "chmod +x /setup-user.sh" run_cmd "/bin/bash /setup-user.sh" run_cmd "rm -rf /setup-user.sh" + if $(ls $chroot_dir/home/$FS_USER); then + shout "User created : $FS_USER" + else + shout "User create failed..." + fi } do_chroot_proot_ae() {