Compare commits

...

5 Commits
main ... v24.05

Author SHA1 Message Date
Igor Pecovnik
a2ebab47e2
Deboostrap: switch to last known working tag 2024-07-29 15:55:07 +02:00
Igor Pecovnik
a2ac7da3b5
Inovato-quadra: changing board support status 2024-06-10 14:26:58 +02:00
Igor Pecovnik
1855acbe7f
Extend mesa-vpu extension to load unpatches Chromium by default
For future - make separate browser extension
2024-05-25 21:37:40 +02:00
Ricardo Pardini
5b30a9723f
base-files: hardcoded cache of base-files version per RELEASE/ARCH, as of 20240522
- packages.debian.org and packages.ubuntu.com are having a meltdown and builds are stuck
- this is a quick & dirty fix to get builds going
- we should urgently replace this with the 'right thing'
- trying to maintain this manually will cause insanity

Signed-off-by: Igor Pecovnik <igor@armbian.com>
2024-05-25 21:37:40 +02:00
Igor Pecovnik
db29891de4
Freeze sources and set version 2024-05-25 21:37:40 +02:00
6 changed files with 337 additions and 18 deletions

View File

@ -1 +1 @@
24.5.0-trunk
24.5.1

View File

@ -1,7 +1,7 @@
# Allwinner H6 quad core 2GB SoC WiFi eMMC
BOARD_NAME="Inovato Quadra"
BOARDFAMILY="sun50iw6"
BOARD_MAINTAINER=""
BOARD_MAINTAINER="NicoD-SBC"
BOOTCONFIG="tanix_tx6_defconfig"
CRUSTCONFIG="tanix_tx6_defconfig"
BOOT_FDT_FILE="allwinner/sun50i-h6-inovato-quadra.dtb"

View File

@ -0,0 +1,242 @@
[
{
"source": "https://github.com/armbian/firmware",
"branch": "master",
"sha1": "6faef0d76cff4f2f6082b6a22245341fcb4f469e"
},
{
"source": "https://github.com/armbian/config",
"branch": "master",
"sha1": "8477995a511abee8ee468a679b685f92607729ec"
},
{
"source": "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git",
"branch": "main",
"sha1": "ec8627effe4d94107e57ac8d54dd55468ce9e2af"
},
{
"source": "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git",
"branch": "linux-6.1.y",
"sha1": "4078fa637fcd80c8487680ec2e4ef7c58308e9aa"
},
{
"source": "https://github.com/starfive-tech/linux",
"branch": "JH7110_VisionFive2_devel",
"sha1": "a61d1d826ca3060fd76ab31d37c691fc09b52fc0"
},
{
"source": "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git",
"branch": "linux-6.7.y",
"sha1": "dacf7e83da42bd9d3978560e41869a784c24d912"
},
{
"source": "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git",
"branch": "linux-6.8.y",
"sha1": "a0c69a570e420e86c7569b8c052913213eef2b45"
},
{
"source": "https://github.com/AvaotaSBC/linux.git",
"branch": "linux-5.15",
"sha1": "c4faaaf9bd13db8a70f1b4e4aa6ce942fb886f94"
},
{
"source": "https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel",
"branch": "ti-linux-6.1.y",
"sha1": "c1c2f1971fbf6ddad93a8c94314fe8221e7aa6be"
},
{
"source": "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git",
"branch": "linux-6.2.y",
"sha1": "46df6964c1a9eb72027710f626cb1c6bfb5d58c9"
},
{
"source": "https://github.com/armbian/linux-rockchip.git",
"branch": "rk-6.1-rkr1",
"sha1": "d06d87ee891e6ea16c9500a386c3a2705d80ce27"
},
{
"source": "https://github.com/radxa/u-boot.git",
"branch": "next-dev-v2024.03",
"sha1": "5a38950b9bf2b117313985a2313d229a60b6d6eb"
},
{
"source": "https://gitlab.collabora.com/hardware-enablement/rockchip-3588/linux.git",
"branch": "rk3588",
"sha1": "23bb9c65a88c114bbe945b7ef5366bb02d3d9b80"
},
{
"source": "https://github.com/armbian/linux-rockchip.git",
"branch": "rk-5.10-rkr6",
"sha1": "9fb8c4cc0ec516870dea431c83e2d546bb57df7d"
},
{
"source": "https://github.com/edk2-porting/linux-next",
"branch": "ci/odin2/stable",
"sha1": "aec2299c5082c84923ea1b33584aaad9884eaf1d"
},
{
"source": "https://github.com/khadas/linux.git",
"branch": "khadas-vims-5.15.y",
"sha1": "7c73436feb2fa7a2f812f8781c695f0977010a06"
},
{
"source": "https://github.com/khadas/common_drivers",
"branch": "khadas-vims-5.15.y",
"sha1": "53a875813c308299788d5900c677335d0ea21b43"
},
{
"source": "https://source.denx.de/u-boot/u-boot.git",
"branch": "v2024.01",
"sha1": "aa6d5f7192d5860458b5ef0163aad1d94e9bde70"
},
{
"source": "https://github.com/bigtreetech/u-boot.git",
"branch": "v2023.07-cb1",
"sha1": "272cd1ca1e11962087d94cd4dc5db3733b2b3ad7"
},
{
"source": "https://github.com/bigtreetech/linux.git",
"branch": "linux-6.1.y-cb1",
"sha1": "f33ca29a323571460e56167c986a52c19a3f1e01"
},
{
"source": "https://github.com/SolidRun/u-boot.git",
"branch": "v2018.01-solidrun-imx6",
"sha1": "5b6bc28ead0674ed9c9b7afa35f35828aad07cda"
},
{
"source": "https://github.com/radxa/u-boot.git",
"branch": "stable-4.19-rock3",
"sha1": "c55987146f4f9b20f7cb2f917ca88300419afe8d"
},
{
"source": "https://github.com/functionland/u-boot.git",
"branch": "next-dev",
"sha1": "46da2bfe5068535caf919a36c6fcc5a7e744a04b"
},
{
"source": "https://github.com/stvhay/u-boot.git",
"branch": "rockchip-rk3588-unified",
"sha1": "2f6e967dc901ae570f522d1b47309e7c34acf542"
},
{
"source": "https://github.com/chainsx/thead-u-boot",
"branch": "extlinux",
"sha1": "990e122d26d1ef94f4e0e1bbf5d7df58e8393eee"
},
{
"source": "https://github.com/chainsx/thead-kernel",
"branch": "th1520",
"sha1": "a76d97e234b6613fc20a3dcbfc99128fe9b05e7a"
},
{
"source": "https://github.com/tq-systems/u-boot-tqmaxx.git",
"branch": "TQMa8-v2020.04_imx_5.4.70_2.3.0",
"sha1": "81e390a605a4e69123dc7a9e3c58e886d461809e"
},
{
"source": "https://github.com/Kwiboo/u-boot-rockchip.git",
"branch": "rk3xxx-2024.04",
"sha1": "830cfcfdf54a1f08a3ca7fc17e69b4bc18cece50"
},
{
"source": "https://github.com/hardkernel/u-boot.git",
"branch": "odroidc-v2011.03",
"sha1": "b7b8dc21b64b9494618325c9b4d2fbae728aeed6"
},
{
"source": "https://github.com/hardkernel/u-boot.git",
"branch": "odroidxu4-v2017.05",
"sha1": "42ac93dcfbbb8a08c2bdc02e19f96eb35a81891a"
},
{
"source": "https://github.com/hardkernel/linux",
"branch": "odroid-6.6.y",
"sha1": "0bbf0929cdf530de1b07e4bd262491aab6282aca"
},
{
"source": "https://github.com/orangepi-xunlong/u-boot-orangepi.git",
"branch": "v2017.09-rk3588",
"sha1": "0f7610abf7053e7b6cf9e7299aa1c0c1648efaa0"
},
{
"source": "https://github.com/orangepi-xunlong/u-boot-orangepi.git",
"branch": "v2018.05-sun50iw9",
"sha1": "2807819ec387107020dc0cd97bb0b2487a3d0714"
},
{
"source": "https://github.com/orangepi-xunlong/linux-orangepi.git",
"branch": "orange-pi-4.9-sun50iw9",
"sha1": "0cd0547ea405b84b5b60fbc92978ac1bc2b68055"
},
{
"source": "https://github.com/chainsx/phytium-linux-kernel",
"branch": "linux-5.10",
"sha1": "b17835d38155a8c2bcb3e2d0f3f55989bf2f1b98"
},
{
"source": "https://github.com/chainsx/phytium-linux-kernel",
"branch": "linux-6.6",
"sha1": "b9b9d633ab5b213fe492a62f35c6cfd5a2614f42"
},
{
"source": "https://github.com/150balbes/u-boot-rk",
"branch": "rk35xx",
"sha1": "1776a2ace31f490c34a4dc4f13db7d3611c3555f"
},
{
"source": "https://github.com/radxa/u-boot.git",
"branch": "rk35xx-2024.01",
"sha1": "31b85240876dc43492b0826a74b99c23fbf6ed9d"
},
{
"source": "https://github.com/raspberrypi/linux",
"branch": "rpi-6.1.y",
"sha1": "21012295fe87a7ccc1c356d1e268fd289aafbad1"
},
{
"source": "https://github.com/raspberrypi/linux",
"branch": "rpi-6.6.y",
"sha1": "55faf2eb5190410941aaabdc5bbd2c74c27f546e"
},
{
"source": "https://github.com/raspberrypi/linux",
"branch": "rpi-6.7.y",
"sha1": "777eaeedd460453f8f2a66643e7a4dea62286dd4"
},
{
"source": "https://github.com/150balbes/u-boot-rk",
"branch": "rk356x",
"sha1": "d4d2e85f6836cf24f08e422520ebb273e2379952"
},
{
"source": "https://github.com/150balbes/u-boot-rk",
"branch": "rk3588",
"sha1": "1133c25725b07bfa27f2eeef26a3af262296fcbf"
},
{
"source": "https://github.com/jhovold/linux.git",
"branch": "wip/sc8280xp-6.9-rc7",
"sha1": "ff8e9aabc1df7fb1658025df41a5ff8fe2e278f2"
},
{
"source": "https://github.com/jglathe/linux_ms_dev_kit.git",
"branch": "jg/wdk2023-gunyah-6.7-rc6",
"sha1": "401bea57d6b96f440142b9039d483c671c4a9587"
},
{
"source": "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git",
"branch": "linux-4.19.y",
"sha1": "56a03f63c0a26b1a00d441d86b26dca714f46587"
},
{
"source": "https://github.com/SolidRun/u-boot",
"branch": "v2018.01-solidrun-a38x",
"sha1": "a8004c1f1112ca2f867badccce5a76f052034853"
},
{
"source": "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git",
"branch": "linux-5.15.y",
"sha1": "83655231580bc07485a4ac2a6c971c3a175dd27d"
}
]

View File

@ -13,6 +13,9 @@ function extension_prepare_config__3d() {
# only used when generating desktop
[[ "${BUILD_DESKTOP}" != "yes" ]] && return 0
# some desktops doesn't support wayland
[[ "${DESKTOP_ENVIRONMENT}" == "xfce" || "${DESKTOP_ENVIRONMENT}" == "i3-wm" ]] && return 0
# Define image suffix
if [[ "${LINUXFAMILY}" =~ ^(rockchip-rk3588|rk35xx)$ && "$BRANCH" =~ ^(legacy)$ && "${RELEASE}" =~ ^(jammy|noble)$ ]]; then
@ -39,6 +42,9 @@ function post_install_kernel_debs__3d() {
# Do not install those packages on CLI and minimal images
[[ "${BUILD_DESKTOP}" != "yes" ]] && return 0
# some desktops doesn't support wayland
[[ "${DESKTOP_ENVIRONMENT}" == "xfce" || "${DESKTOP_ENVIRONMENT}" == "i3-wm" ]] && return 0
# Packages that are going to be installed
declare -a pkgs=("mesa-utils" "mesa-utils-extra" "libglx-mesa0" "libgl1-mesa-dri" "glmark2" "glmark2-wayland" "glmark2-es2-wayland" "glmark2-es2")
@ -72,6 +78,36 @@ function post_install_kernel_debs__3d() {
Pin-Priority: 1001
EOF
if [[ "${ARCH}" == "arm64" ]]; then
display_alert "Adding Amazingfate Chromium PPAs" "${EXTENSION}" "info"
do_with_retries 3 chroot_sdcard add-apt-repository ppa:liujianfeng1994/chromium --yes --no-update
sed -i "s/oracular/noble/g" "${SDCARD}"/etc/apt/sources.list.d/liujianfeng1994-ubuntu-chromium-"${RELEASE}".*
display_alert "Pinning amazingfated's Chromium PPAs" "${EXTENSION}" "info"
cat <<- EOF > "${SDCARD}"/etc/apt/preferences.d/liujianfeng1994-chromium-pin
Package: *
Pin: release o=LP-PPA-liujianfeng1994-chromium
Pin-Priority: 1001
EOF
else
display_alert "Adding Xtradebs Apps PPAs" "${EXTENSION}" "info"
do_with_retries 3 chroot_sdcard add-apt-repository ppa:xtradeb/apps --yes --no-update
sed -i "s/oracular/noble/g" "${SDCARD}"/etc/apt/sources.list.d/xtradeb-ubuntu-apps-"${RELEASE}".*
display_alert "Pinning Xtradebs PPAs" "${EXTENSION}" "info"
cat <<- EOF > "${SDCARD}"/etc/apt/preferences.d/xtradebs-apps-pin
Package: *
Pin: release o=LP-PPA-xtradebs-apps
Pin-Priority: 1001
EOF
fi
pkgs+=("chromium")
fi
if [[ "${LINUXFAMILY}" =~ ^(rockchip-rk3588|rk35xx)$ && "${RELEASE}" =~ ^(jammy|noble)$ && "${BRANCH}" =~ ^(legacy|vendor)$ ]]; then
@ -103,4 +139,9 @@ function post_install_kernel_debs__3d() {
display_alert "Upgrading Mesa packages" "${EXTENSION}" "info"
do_with_retries 3 chroot_sdcard_apt_get dist-upgrade
# Disable wayland flag for XFCE
#if [[ "${DESKTOP_ENVIRONMENT}" == "xfce" ]]; then
# sed -e '/wayland/ s/^#*/#/' -i "${SDCARD}"/etc/chromium.d/default-flags
#fi
}

View File

@ -26,15 +26,51 @@ function artifact_armbian-base-files_prepare_version() {
declare fake_unchanging_base_version="1-${RELEASE}-1armbian1"
declare found_package_version="undetermined" found_package_filename="undetermined" found_package_down_url="undetermined"
sleep_seconds="15" do_with_retries 10 apt_find_upstream_package_version_and_download_url "base-files"
# download the file, but write it to /dev/null (just for testing it is correct)
# wget --timeout=15 --output-document=/dev/null "${found_package_down_url}" || exit_with_error "Could not download '${found_package_down_url}'"
# To generate the case statements below, uncomment the echo/exit on line 71, then run:
#for onerelease in "bullseye" "bookworm" "trixie" "sid" "jammy" "noble" "oracular"; do
# for oneboard in "uefi-arm64" "tinkerboard" "uefi-x86" "uefi-riscv64"; do
# echo "oneboard: $oneboard - onerelease: $onerelease"
# ./compile.sh rpardini-generic armbian-base-files BRANCH=current BOARD=$oneboard RELEASE=$onerelease
# done
#done
# Set readonly globals with the wanted info; will be used during the actual build of this artifact
declare -g -r base_files_wanted_upstream_version="${found_package_version}"
declare -g -r base_files_wanted_upstream_filename="${found_package_filename}"
declare -g -r base_files_wanted_deb_down_url="${found_package_down_url}"
case "${RELEASE}-${ARCH}" in
"bookworm-amd64") base_files_wanted_upstream_version="12.4+deb12u5" base_files_wanted_upstream_filename="base-files_12.4+deb12u5_amd64.deb" base_files_wanted_deb_down_url="http://deb.debian.org/debian/pool/main/b/base-files/base-files_12.4+deb12u5_amd64.deb" ;;
"bookworm-arm64") base_files_wanted_upstream_version="12.4+deb12u5" base_files_wanted_upstream_filename="base-files_12.4+deb12u5_arm64.deb" base_files_wanted_deb_down_url="http://deb.debian.org/debian/pool/main/b/base-files/base-files_12.4+deb12u5_arm64.deb" ;;
"bookworm-armhf") base_files_wanted_upstream_version="12.4+deb12u5" base_files_wanted_upstream_filename="base-files_12.4+deb12u5_armhf.deb" base_files_wanted_deb_down_url="http://deb.debian.org/debian/pool/main/b/base-files/base-files_12.4+deb12u5_armhf.deb" ;;
"bullseye-amd64") base_files_wanted_upstream_version="11.1+deb11u9" base_files_wanted_upstream_filename="base-files_11.1+deb11u9_amd64.deb" base_files_wanted_deb_down_url="http://deb.debian.org/debian/pool/main/b/base-files/base-files_11.1+deb11u9_amd64.deb" ;;
"bullseye-arm64") base_files_wanted_upstream_version="11.1+deb11u9" base_files_wanted_upstream_filename="base-files_11.1+deb11u9_arm64.deb" base_files_wanted_deb_down_url="http://deb.debian.org/debian/pool/main/b/base-files/base-files_11.1+deb11u9_arm64.deb" ;;
"bullseye-armhf") base_files_wanted_upstream_version="11.1+deb11u9" base_files_wanted_upstream_filename="base-files_11.1+deb11u9_armhf.deb" base_files_wanted_deb_down_url="http://deb.debian.org/debian/pool/main/b/base-files/base-files_11.1+deb11u9_armhf.deb" ;;
"jammy-amd64") base_files_wanted_upstream_version="12ubuntu4.6" base_files_wanted_upstream_filename="base-files_12ubuntu4.6_amd64.deb" base_files_wanted_deb_down_url="http://archive.ubuntu.com/ubuntu/pool/main/b/base-files/base-files_12ubuntu4.6_amd64.deb" ;;
"jammy-arm64") base_files_wanted_upstream_version="12ubuntu4.6" base_files_wanted_upstream_filename="base-files_12ubuntu4.6_arm64.deb" base_files_wanted_deb_down_url="http://ports.ubuntu.com/pool/main/b/base-files/base-files_12ubuntu4.6_arm64.deb" ;;
"jammy-armhf") base_files_wanted_upstream_version="12ubuntu4.6" base_files_wanted_upstream_filename="base-files_12ubuntu4.6_armhf.deb" base_files_wanted_deb_down_url="http://ports.ubuntu.com/pool/main/b/base-files/base-files_12ubuntu4.6_armhf.deb" ;;
"jammy-riscv64") base_files_wanted_upstream_version="12ubuntu4.6" base_files_wanted_upstream_filename="base-files_12ubuntu4.6_riscv64.deb" base_files_wanted_deb_down_url="http://ports.ubuntu.com/pool/main/b/base-files/base-files_12ubuntu4.6_riscv64.deb" ;;
"noble-amd64") base_files_wanted_upstream_version="13ubuntu10" base_files_wanted_upstream_filename="base-files_13ubuntu10_amd64.deb" base_files_wanted_deb_down_url="http://archive.ubuntu.com/ubuntu/pool/main/b/base-files/base-files_13ubuntu10_amd64.deb" ;;
"noble-arm64") base_files_wanted_upstream_version="13ubuntu10" base_files_wanted_upstream_filename="base-files_13ubuntu10_arm64.deb" base_files_wanted_deb_down_url="http://ports.ubuntu.com/pool/main/b/base-files/base-files_13ubuntu10_arm64.deb" ;;
"noble-armhf") base_files_wanted_upstream_version="13ubuntu10" base_files_wanted_upstream_filename="base-files_13ubuntu10_armhf.deb" base_files_wanted_deb_down_url="http://ports.ubuntu.com/pool/main/b/base-files/base-files_13ubuntu10_armhf.deb" ;;
"noble-riscv64") base_files_wanted_upstream_version="13ubuntu10" base_files_wanted_upstream_filename="base-files_13ubuntu10_riscv64.deb" base_files_wanted_deb_down_url="http://ports.ubuntu.com/pool/main/b/base-files/base-files_13ubuntu10_riscv64.deb" ;;
"oracular-amd64") base_files_wanted_upstream_version="13.1ubuntu1" base_files_wanted_upstream_filename="base-files_13.1ubuntu1_amd64.deb" base_files_wanted_deb_down_url="http://archive.ubuntu.com/ubuntu/pool/main/b/base-files/base-files_13.1ubuntu1_amd64.deb" ;;
"oracular-arm64") base_files_wanted_upstream_version="13.1ubuntu1" base_files_wanted_upstream_filename="base-files_13.1ubuntu1_arm64.deb" base_files_wanted_deb_down_url="http://ports.ubuntu.com/pool/main/b/base-files/base-files_13.1ubuntu1_arm64.deb" ;;
"oracular-armhf") base_files_wanted_upstream_version="13.1ubuntu1" base_files_wanted_upstream_filename="base-files_13.1ubuntu1_armhf.deb" base_files_wanted_deb_down_url="http://ports.ubuntu.com/pool/main/b/base-files/base-files_13.1ubuntu1_armhf.deb" ;;
"oracular-riscv64") base_files_wanted_upstream_version="13.1ubuntu1" base_files_wanted_upstream_filename="base-files_13.1ubuntu1_riscv64.deb" base_files_wanted_deb_down_url="http://ports.ubuntu.com/pool/main/b/base-files/base-files_13.1ubuntu1_riscv64.deb" ;;
"sid-amd64") base_files_wanted_upstream_version="13.2" base_files_wanted_upstream_filename="base-files_13.2_amd64.deb" base_files_wanted_deb_down_url="http://deb.debian.org/debian/pool/main/b/base-files/base-files_13.2_amd64.deb" ;;
"sid-arm64") base_files_wanted_upstream_version="13.2" base_files_wanted_upstream_filename="base-files_13.2_arm64.deb" base_files_wanted_deb_down_url="http://deb.debian.org/debian/pool/main/b/base-files/base-files_13.2_arm64.deb" ;;
"sid-armhf") base_files_wanted_upstream_version="13.2" base_files_wanted_upstream_filename="base-files_13.2_armhf.deb" base_files_wanted_deb_down_url="http://deb.debian.org/debian/pool/main/b/base-files/base-files_13.2_armhf.deb" ;;
"sid-riscv64") base_files_wanted_upstream_version="13.2" base_files_wanted_upstream_filename="base-files_13.2_riscv64.deb" base_files_wanted_deb_down_url="http://deb.debian.org/debian/pool/main/b/base-files/base-files_13.2_riscv64.deb" ;;
"trixie-amd64") base_files_wanted_upstream_version="13.2" base_files_wanted_upstream_filename="base-files_13.2_amd64.deb" base_files_wanted_deb_down_url="http://deb.debian.org/debian/pool/main/b/base-files/base-files_13.2_amd64.deb" ;;
"trixie-arm64") base_files_wanted_upstream_version="13.2" base_files_wanted_upstream_filename="base-files_13.2_arm64.deb" base_files_wanted_deb_down_url="http://deb.debian.org/debian/pool/main/b/base-files/base-files_13.2_arm64.deb" ;;
*)
display_alert "Release ${RELEASE} and arch ${ARCH}" "base-files hardcoded cache not found, will hit packages server for info" "warn"
sleep_seconds="15" do_with_retries 10 apt_find_upstream_package_version_and_download_url "base-files"
# Set readonly globals with the wanted info; will be used during the actual build of this artifact
declare -g -r base_files_wanted_upstream_version="${found_package_version}"
declare -g -r base_files_wanted_upstream_filename="${found_package_filename}"
declare -g -r base_files_wanted_deb_down_url="${found_package_down_url}"
# echo "\"${RELEASE}-${ARCH}\") base_files_wanted_upstream_version=\"${base_files_wanted_upstream_version}\" base_files_wanted_upstream_filename=\"${base_files_wanted_upstream_filename}\" base_files_wanted_deb_down_url=\"${base_files_wanted_deb_down_url}\";;" >> "${SRC}/output/basefiles.sh" && exit 0
;;
esac
# for OCI tags, we can't have "+" or "~" in the version, which happens in bookworm and some others. clean it up
declare base_files_cleaned_upstream_version_tag="${base_files_wanted_upstream_version//+/--}"
@ -147,18 +183,18 @@ function compile_armbian-base-files() {
# Create preinst file if not exists (Debian)
if [[ ! -e "${destination}"/DEBIAN/preinst ]]; then
cat <<- EOD >> "${destination}"/DEBIAN/preinst
#!/bin/sh
set -e
# Start of automatically added by ${VENDOR}
rm -f /etc/dpkg/origins/default # reset default link
# End of automatically added by ${VENDOR}
#!/bin/sh
set -e
# Start of automatically added by ${VENDOR}
rm -f /etc/dpkg/origins/default # reset default link
# End of automatically added by ${VENDOR}
EOD
chmod 0755 "${destination}"/DEBIAN/preinst
else
cat <<- EOD >> "${destination}"/DEBIAN/preinst
# Start of automatically added by ${VENDOR}
rm -f /etc/dpkg/origins/default # reset default link
# End of automatically added by ${VENDOR}
# Start of automatically added by ${VENDOR}
rm -f /etc/dpkg/origins/default # reset default link
# End of automatically added by ${VENDOR}
EOD
fi

View File

@ -68,7 +68,7 @@ function create_new_rootfs_cache_via_debootstrap() {
display_alert "Preparing debootstrap" "for ${DISTRIBUTION}'s ${RELEASE}" "info"
case "${DISTRIBUTION}" in
Ubuntu)
GIT_FIXED_WORKDIR="debootstrap-ubuntu-devel" fetch_from_repo "https://git.launchpad.net/ubuntu/+source/debootstrap" "debootstrap-ubuntu-devel" "branch:ubuntu/devel"
GIT_FIXED_WORKDIR="debootstrap-ubuntu-devel" fetch_from_repo "https://git.launchpad.net/ubuntu/+source/debootstrap" "debootstrap-ubuntu-devel" "tag:import/1.0.118ubuntu1.13"
debootstrap_wanted_dir="${SRC}/cache/sources/debootstrap-ubuntu-devel"
debootstrap_default_script="gutsy"
;;