enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Debian 11 bullseye

Browse Source
This commit is contained in:
Igor Pecovnik 2019-12-13 20:01:00 +01:00
parent 6e54a48778
commit 8df3e98401
9 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/build-all-ng.sh
View File

@ -277,7 +277,7 @@ function build_all()
IFS=',' read -a RELBRANCH <<< $KERNEL_TARGET
for BRANCH in "${RELBRANCH[@]}"
do
RELTARGETS=(xenial stretch buster bionic eoan focal)
RELTARGETS=(xenial stretch buster bullseye bionic eoan focal)
for RELEASE in "${RELTARGETS[@]}"
do
display_alert "BSP for ${BOARD} ${BRANCH} ${RELEASE}."

9
lib/chroot-buildpackages.sh
View File

@ -28,12 +28,14 @@ create_chroot()
qemu_binary['arm64']='qemu-aarch64-static'
apt_mirror['stretch']="$DEBIAN_MIRROR"
apt_mirror['buster']="$DEBIAN_MIRROR"
apt_mirror['bullseye']="$DEBIAN_MIRROR"
apt_mirror['xenial']="$UBUNTU_MIRROR"
apt_mirror['bionic']="$UBUNTU_MIRROR"
apt_mirror['focal']="$UBUNTU_MIRROR"
apt_mirror['eoan']="$UBUNTU_MIRROR"
components['stretch']='main,contrib'
components['buster']='main,contrib'
components['bullseye']='main,contrib'
components['xenial']='main,universe,multiverse'
components['bionic']='main,universe,multiverse'
components['focal']='main,universe,multiverse'
@ -41,7 +43,7 @@ create_chroot()
display_alert "Creating build chroot" "$release/$arch" "info"
local includes="ccache,locales,git,ca-certificates,devscripts,libfile-fcntllock-perl,debhelper,rsync,python3,distcc"
# perhaps a temporally workaround
[[ $release == buster || $release == focal || $release == eoan ]] && includes=$includes",perl-openssl-defaults,libnet-ssleay-perl"
[[ $release == buster || $release == bullseye || $release == focal || $release == eoan ]] && includes=$includes",perl-openssl-defaults,libnet-ssleay-perl"
if [[ $NO_APT_CACHER != yes ]]; then
local mirror_addr="http://localhost:3142/${apt_mirror[$release]}"
else
@ -91,9 +93,10 @@ chroot_prepare_distccd()
declare -A gcc_version gcc_type
gcc_version['stretch']='6.3'
gcc_version['buster']='8.3'
gcc_version['bullseye']='9.2'
gcc_version['xenial']='5.4'
gcc_version['bionic']='5.4'
gcc_version['focal']='8.3'
gcc_version['focal']='9.2'
gcc_version['eoan']='9.2'
gcc_type['armhf']='arm-linux-gnueabihf-'
gcc_type['arm64']='aarch64-linux-gnu-'
@ -127,7 +130,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 focal eoan"
target_release="stretch bionic buster bullseye eoan focal"
target_arch="armhf arm64"
fi

2
lib/configuration.sh
View File

@ -213,7 +213,7 @@ case $RELEASE in
language-selector-gnome leafpad"
;;
buster)
buster|bullseye)
DEBOOTSTRAP_COMPONENTS="main"
DEBOOTSTRAP_LIST+=" rng-tools"
[[ -z $BUILD_MINIMAL || $BUILD_MINIMAL == no ]] && PACKAGE_LIST_RELEASE="man-db kbd net-tools gnupg2 dirmngr networkd-dispatcher"

2
lib/debootstrap.sh
View File

@ -301,7 +301,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 [[ $(lsb_release -sc) =~ bionic|buster|cosmic|eoan|focal ]]; then
if [[ $(lsb_release -sc) =~ bionic|buster|bullseye|cosmic|eoan|focal ]]; then
mkopts[ext4]='-q -m 2 -O ^64bit,^metadata_csum'
elif [[ $(lsb_release -sc) == xenial ]]; then
mkopts[ext4]='-q -m 2'

2
lib/desktop.sh
View File

@ -90,7 +90,7 @@ create_desktop_package ()
# using different icon pack. Workaround due to this bug https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=867779
if [[ ${RELEASE} == bionic || ${RELEASE} == stretch || ${RELEASE} == buster || ${RELEASE} == focal || ${RELEASE} == eoan ]]; then
if [[ ${RELEASE} == bionic || ${RELEASE} == stretch || ${RELEASE} == buster || ${RELEASE} == bullseye || ${RELEASE} == focal || ${RELEASE} == eoan ]]; then
sed -i 's/<property name="IconThemeName" type="string" value=".*$/<property name="IconThemeName" type="string" value="Humanity-Dark"\/>/g' \
"${destination}"/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
fi

2
lib/distributions.sh
View File

@ -421,7 +421,7 @@ install_distribution_specific()
;;
stretch|buster)
stretch|buster|bullseye)
# remove doubled uname from motd
[[ -f $SDCARD/etc/update-motd.d/10-uname ]] && rm "${SDCARD}"/etc/update-motd.d/10-uname

8
lib/general.sh
View File

@ -123,7 +123,7 @@ get_package_list_hash()
# create_sources_list <release> <basedir>
#
# <release>: stretch|buster|xenial|bionic|eoan|focal
# <release>: stretch|buster|bullseye|xenial|bionic|eoan|focal
# <basedir>: path to root directory
#
create_sources_list()
@ -133,7 +133,7 @@ create_sources_list()
[[ -z $basedir ]] && exit_with_error "No basedir passed to create_sources_list"
case $release in
stretch|buster)
stretch|buster|bullseye)
cat <<-EOF > $basedir/etc/apt/sources.list
deb http://${DEBIAN_MIRROR} $release main contrib non-free
#deb-src http://${DEBIAN_MIRROR} $release main contrib non-free
@ -454,7 +454,7 @@ addtorepo()
# parameter "delete" remove incoming directory if publishing is succesful
# function: cycle trough distributions
local distributions=("xenial" "stretch" "bionic" "buster" "eoan" "focal")
local distributions=("xenial" "stretch" "bionic" "buster" "bullseye" "eoan" "focal")
local errors=0
for release in "${distributions[@]}"; do
@ -565,7 +565,7 @@ addtorepo()
repo-manipulate() {
local DISTROS=("xenial" "stretch" "bionic" "buster" "eoan" "focal")
local DISTROS=("xenial" "stretch" "bionic" "buster" "bullseye" "eoan" "focal")
case $@ in
serve)
# display repository content

3
lib/main.sh
View File

@ -276,6 +276,8 @@ distro_name['stretch']="Debian 9 Stretch"
distro_support['stretch']="eos"
distro_name['buster']="Debian 10 Buster"
distro_support['buster']="supported"
distro_name['bullseye']="Debian 11 Bullseye"
distro_support['bullseye']="csc"
distro_name['xenial']="Ubuntu Xenial 16.04 LTS"
distro_support['xenial']="eos"
distro_name['bionic']="Ubuntu Bionic 18.04 LTS"
@ -291,6 +293,7 @@ if [[ $KERNEL_ONLY != yes && -z $RELEASE ]]; then
distro_menu "stretch"
distro_menu "buster"
distro_menu "bullseye"
distro_menu "xenial"
distro_menu "bionic"
distro_menu "eoan"

4
packages/extras-buildpkgs/90-hostapd.conf
View File

@ -1,8 +1,8 @@
# hostapd
local package_name="hostapd"
local package_repo="http://w1.fi/hostap.git"
local package_ref="tag:hostap_2_7"
local package_upstream_version="3:2.7-99"
local package_ref="tag:hostap_2_9"
local package_upstream_version="3:2.9-99"
local package_builddeps="pkg-config libssl-dev libreadline-dev libpcsclite-dev libnl-route-3-dev libnl-genl-3-dev libnl-3-dev libncurses5-dev libdbus-1-dev docbook-utils docbook-to-man"
local package_install_target="hostapd"
local package_component="${release}-utils"