drholy/orangepi-build
1
0
Fork 0
mirror of https://github.com/DrHo1y/orangepi-build.git synced 2026-10-03 00:46:38 +07:00
Code Issues Packages Projects Releases Wiki Activity

Support opizero2w/opizero3 Ubuntu24.04

Browse Source
This commit is contained in:
toolsmanhehe
2024-09-11 21:00:33 +08:00
committed by baiywt
parent a0a22dc9bb
commit c8894b658c
48 changed files with 580 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/chroot-buildpackages.sh
View File

@@ -39,6 +39,7 @@ create_chroot()
apt_mirror['impish']="$UBUNTU_MIRROR"
components['stretch']='main,contrib'
apt_mirror['jammy']="$UBUNTU_MIRROR"
apt_mirror['noble']="$UBUNTU_MIRROR"
components['buster']='main,contrib'
components['bullseye']='main,contrib'
components['bookworm']='main,contrib'
@@ -49,6 +50,7 @@ create_chroot()
components['hirsute']='main,universe,multiverse'
components['impish']='main,universe,multiverse'
components['jammy']='main,universe,multiverse'
components['noble']='main,universe,multiverse'
display_alert "Creating build chroot" "$release/$arch" "info"
local includes="ccache,locales,git,ca-certificates,devscripts,libfile-fcntllock-perl,debhelper,rsync,python3,distcc,apt-utils"
@@ -140,6 +142,7 @@ chroot_prepare_distccd()
gcc_version['bionic']='5.4'
gcc_version['focal']='9.2'
gcc_version['jammy']='10.2'
gcc_version['noble']='13.2'
gcc_version['hirsute']='10.2'
gcc_version['sid']='10.2'
gcc_type['armhf']='arm-linux-gnueabihf-'
@@ -176,7 +179,7 @@ chroot_build_packages()
target_arch="${ARCH}"
else
# only make packages for recent releases. There are no changes on older
target_release="stretch bionic buster bullseye bookworm focal hirsute jammy sid"
target_release="stretch bionic buster bullseye bookworm focal hirsute jammy noble sid"
target_arch="armhf arm64"
fi

2
scripts/configuration.sh
View File

@@ -416,7 +416,7 @@ BOOTCONFIG_VAR_NAME=BOOTCONFIG_${BRANCH^^}
[[ -z $ATFPATCHDIR ]] && ATFPATCHDIR="atf-$LINUXFAMILY"
[[ -z $KERNELPATCHDIR ]] && KERNELPATCHDIR="$LINUXFAMILY-$BRANCH"
if [[ "$RELEASE" =~ ^(xenial|bionic|focal|hirsute|impish|jammy)$ ]]; then
if [[ "$RELEASE" =~ ^(xenial|bionic|focal|hirsute|impish|jammy|noble)$ ]]; then
DISTRIBUTION="Ubuntu"
elif [[ "$RELEASE" == raspi ]]; then
DISTRIBUTION="Bullseye"

2
scripts/debootstrap.sh
View File

@@ -458,7 +458,7 @@ prepare_partitions() {
# parttype[nfs] is empty
# metadata_csum and 64bit may need to be disabled explicitly when migrating to newer supported host OS releases
if [[ $HOSTRELEASE =~ buster|bullseye|bookworm|bionic|focal|jammy|kinetic|sid ]]; then
if [[ $HOSTRELEASE =~ buster|bullseye|bookworm|bionic|focal|jammy|noble|kinetic|sid ]]; then
mkopts[ext4]="-q -m 2 -O ^64bit,^metadata_csum"
fi
# mkopts[fat] is empty

2
scripts/distributions.sh
View File

@@ -743,7 +743,7 @@ install_distribution_specific()
;;
bionic|focal|hirsute|impish|jammy)
bionic|focal|hirsute|impish|jammy|noble)
# by using default lz4 initrd compression leads to corruption, go back to proven method
sed -i "s/^COMPRESS=.*/COMPRESS=gzip/" "${SDCARD}"/etc/initramfs-tools/initramfs.conf

18
scripts/general.sh
View File

@@ -158,7 +158,7 @@ get_package_list_hash()
# create_sources_list <release> <basedir>
#
# <release>: buster|bullseye|bookworm|bionic|focal|jammy|hirsute|sid
# <release>: buster|bullseye|bookworm|bionic|focal|jammy|noble|hirsute|sid
# <basedir>: path to root directory
#
create_sources_list()
@@ -227,7 +227,7 @@ create_sources_list()
EOF
;;
xenial|bionic|focal|hirsute|impish|jammy)
xenial|bionic|focal|hirsute|impish|jammy|noble)
cat <<-EOF > "${basedir}"/etc/apt/sources.list
deb http://${UBUNTU_MIRROR} $release main restricted universe multiverse
#deb-src http://${UBUNTU_MIRROR} $release main restricted universe multiverse
@@ -874,13 +874,13 @@ function distro_menu ()
[[ -z "${DISTRIB_TYPE_LEGACY}" ]] && DISTRIB_TYPE="buster bionic focal"
elif [[ "${BRANCH}" == "current" ]]; then
DISTRIB_TYPE="${DISTRIB_TYPE_CURRENT}"
[[ -z "${DISTRIB_TYPE_CURRENT}" ]] && DISTRIB_TYPE="bullseye bookworm focal jammy"
[[ -z "${DISTRIB_TYPE_CURRENT}" ]] && DISTRIB_TYPE="bullseye bookworm focal jammy noble"
elif [[ "${BRANCH}" == "next" ]]; then
if [[ -n "${DISTRIB_TYPE_NEXT}" ]]; then
DISTRIB_TYPE="${DISTRIB_TYPE_NEXT}"
else
DISTRIB_TYPE="${DISTRIB_TYPE_CURRENT}"
[[ -z "${DISTRIB_TYPE_CURRENT}" ]] && DISTRIB_TYPE="bullseye bookworm focal jammy"
[[ -z "${DISTRIB_TYPE_CURRENT}" ]] && DISTRIB_TYPE="bullseye bookworm focal jammy noble"
fi
fi
@@ -941,7 +941,7 @@ addtorepo()
# parameter "delete" remove incoming directory if publishing is succesful
# function: cycle trough distributions
local distributions=("stretch" "bionic" "buster" "bullseye" "bookworm" "focal" "hirsute" "jammy" "sid")
local distributions=("stretch" "bionic" "buster" "bullseye" "bookworm" "focal" "hirsute" "jammy" "noble" "sid")
#local distributions=($(grep -rw config/distributions/*/ -e 'supported' | cut -d"/" -f3))
local errors=0
@@ -1071,7 +1071,7 @@ repo-manipulate()
# "update" search for new files in output/debs* to add them to repository
# "purge" leave only last 5 versions
local DISTROS=("stretch" "bionic" "buster" "bullseye" "bookworm" "focal" "hirsute" "jammy" "sid")
local DISTROS=("stretch" "bionic" "buster" "bullseye" "bookworm" "focal" "hirsute" "jammy" "noble" "sid")
#local DISTROS=($(grep -rw config/distributions/*/ -e 'supported' | cut -d"/" -f3))
case $@ in
@@ -1445,7 +1445,7 @@ prepare_host()
fi
# Add support for Ubuntu 20.04, 21.04 and Mint 20.x
if [[ $HOSTRELEASE =~ ^(focal|hirsute|jammy|ulyana|ulyssa|bullseye|bookworm|uma)$ ]]; then
if [[ $HOSTRELEASE =~ ^(focal|hirsute|jammy|noble|noble|ulyana|ulyssa|bullseye|bookworm|uma)$ ]]; then
hostdeps+=" python2 python3"
ln -fs /usr/bin/python2.7 /usr/bin/python2
ln -fs /usr/bin/python2.7 /usr/bin/python
@@ -1460,7 +1460,7 @@ prepare_host()
#
# NO_HOST_RELEASE_CHECK overrides the check for a supported host system
# Disable host OS check at your own risk. Any issues reported with unsupported releases will be closed without discussion
if [[ -z $HOSTRELEASE || "focal jammy" != *"$HOSTRELEASE"* ]]; then
if [[ -z $HOSTRELEASE || "focal jammy noble" != *"$HOSTRELEASE"* ]]; then
if [[ $NO_HOST_RELEASE_CHECK == yes ]]; then
display_alert "You are running on an unsupported system" "${HOSTRELEASE:-(unknown)}" "wrn"
display_alert "Do not report any errors, warnings or other issues encountered beyond this point" "" "wrn"
@@ -1913,7 +1913,7 @@ install_docker() {
buster|bullseye|bookworm)
distributor_id="debian"
;;
xenial|bionic|focal|jammy)
xenial|bionic|focal|jammy|noble)
distributor_id="ubuntu"
;;
esac