Qubot/armbian-b
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

support bookworm build

Browse Source
This commit is contained in:
August 2024-03-16 20:41:42 +08:00
parent 218ef89626
commit 440c7dc8da
12 changed files with 89 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bookworm_xfce_desktop.sh Executable file
View File

@ -0,0 +1 @@
./compile.sh SHOW_DEBUG=yes NO_APT_CACHER=yes OFFLINE_WORK=no DOWNLOAD_MIRROR=ustc SKIP_ARMBIAN_REPO=yes USE_TORRENT=yes CLEAN_LEVEL=make,debs,alldebs,oldcache BOARD=$1 BRANCH=$2 RELEASE=bookworm BUILD_MINIMAL=no BUILD_DESKTOP=yes BUILD_ONLY=default KERNEL_GIT=full KERNEL_CONFIGURE=no INSTALL_HEADERS=yes DESKTOP_ENVIRONMENT=xfce DESKTOP_ENVIRONMENT_CONFIG_NAME=config_base DESKTOP_APPGROUPS_SELECTED="browsers desktop_tools editors multimedia remote_desktop" COMPRESS_OUTPUTIMAGE=sha,xz BUILD_TYPE=$3

16
config/sources/families/include/meson64_common_bpi.inc
View File

@ -107,6 +107,22 @@ function custom_apt_repo__bpi_release_apt_list()
EOF
;;
"bookworm")
cat <<- EOF > "${SDCARD}"/etc/apt/sources.list
deb http://${DEBIAN_MIRROR} ${RELEASE} main contrib non-free non-free-firmware
#deb-src http://${DEBIAN_MIRROR} ${RELEASE} main contrib non-free non-free-firmware
deb http://${DEBIAN_MIRROR} ${RELEASE}-updates main contrib non-free non-free-firmware
#deb-src http://${DEBIAN_MIRROR} ${RELEASE}-updates main contrib non-free non-free-firmware
deb http://${DEBIAN_MIRROR} ${RELEASE}-backports main contrib non-free non-free-firmware
#deb-src http://${DEBIAN_MIRROR} ${RELEASE}-backports main contrib non-free non-free-firmware
deb http://${DEBIAN_SECURTY} ${RELEASE}-security main contrib non-free non-free-firmware
#deb-src http://${DEBIAN_SECURTY} ${RELEASE}-security main contrib non-free non-free-firmware
EOF
;;
"focal"|"jammy")
cat <<- EOF > "${SDCARD}"/etc/apt/sources.list
deb http://${UBUNTU_MIRROR} ${RELEASE} main restricted universe multiverse

7
config/sources/families/meson-g12b-bpi.conf
View File

@ -63,12 +63,15 @@ if [[ "${BUILD_DESKTOP}" == "yes" ]]; then
"jammy")
PACKAGE_LIST_FAMILY+=" libxapp1 xapp zenity"
;;
"bookworm")
PACKAGE_LIST_FAMILY+=" zenity"
;;
esac
fi
# additional packages uninstall
PACKAGE_LIST_FAMILY_REMOVE="btrfs-progs"
if [[ "${RELEASE}" != "bullseye" ]]; then
if [[ "${RELEASE}" != "bullseye" && "${RELEASE}" != "bookworm" ]]; then
PACKAGE_LIST_FAMILY_REMOVE+=" update-manager"
fi
@ -86,7 +89,7 @@ function image_specific_armbian_env_ready__mesong12b_bpi_bootscript() {
display_alert "$BOARD" "Updating boot script and env" "info"
# switch to cgroup v1 to fix docker issue for old kernel 4.9
if [[ "${RELEASE}" == "bullseye" || "${RELEASE}" == "jammy" ]]; then
if [[ "${RELEASE}" == "bullseye" || "${RELEASE}" == "jammy" || "${RELEASE}" == "bookworm" ]]; then
sed -i 's/extraargs=/extraargs=systemd.unified_cgroup_hierarchy=0 /g' "${SDCARD}"/boot/armbianEnv.txt
fi
}

7
config/sources/families/meson-sm1-bpi.conf
View File

@ -63,12 +63,15 @@ if [[ "${BUILD_DESKTOP}" == "yes" ]]; then
"jammy")
PACKAGE_LIST_FAMILY+=" libxapp1 xapp zenity"
;;
"bookworm")
PACKAGE_LIST_FAMILY+=" zenity"
;;
esac
fi
# additional packages uninstall
PACKAGE_LIST_FAMILY_REMOVE="btrfs-progs"
if [[ "${RELEASE}" != "bullseye" ]]; then
if [[ "${RELEASE}" != "bullseye" && "${RELEASE}" != "bookworm" ]]; then
PACKAGE_LIST_FAMILY_REMOVE+=" update-manager"
fi
@ -86,7 +89,7 @@ function image_specific_armbian_env_ready__mesonsm1_bpi_bootscript() {
display_alert "$BOARD" "Updating boot script and env" "info"
# switch to cgroup v1 to fix docker issue for old kernel 4.9
if [[ "${RELEASE}" == "bullseye" || "${RELEASE}" == "jammy" ]]; then
if [[ "${RELEASE}" == "bullseye" || "${RELEASE}" == "jammy" || "${RELEASE}" == "bookworm" ]]; then
sed -i 's/extraargs=/extraargs=systemd.unified_cgroup_hierarchy=0 /g' "${SDCARD}"/boot/armbianEnv.txt
fi
}

30
packages/blobs/bpi-meson-g12b/docker/bookworm/docker_install.sh Executable file
View File

@ -0,0 +1,30 @@
#!/bin/bash
# fix buster docker.service start fail
sudo update-alternatives --set iptables /usr/sbin/iptables-legacy
# uninstall old version
for pkg in docker.io docker-doc docker-compose podman-docker containerd runc; do
sudo apt-get remove $pkg;
done
# apt repository
# Add Docker's official GPG key:
sudo apt-get update
sudo apt-get install ca-certificates curl
sudo install -m 0755 -d /etc/apt/keyrings
sudo curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc
sudo chmod a+r /etc/apt/keyrings/docker.asc
# Add the repository to Apt sources:
echo \
"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian \
$(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
sudo apt-get update
# install docker packages
sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
# verify installation
sudo docker run hello-world

30
packages/blobs/bpi-meson-sm1/docker/bookworm/docker_install.sh Executable file
View File

@ -0,0 +1,30 @@
#!/bin/bash
# fix buster docker.service start fail
sudo update-alternatives --set iptables /usr/sbin/iptables-legacy
# uninstall old version
for pkg in docker.io docker-doc docker-compose podman-docker containerd runc; do
sudo apt-get remove $pkg;
done
# apt repository
# Add Docker's official GPG key:
sudo apt-get update
sudo apt-get install ca-certificates curl
sudo install -m 0755 -d /etc/apt/keyrings
sudo curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc
sudo chmod a+r /etc/apt/keyrings/docker.asc
# Add the repository to Apt sources:
echo \
"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian \
$(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
sudo apt-get update
# install docker packages
sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
# verify installation
sudo docker run hello-world

2
packages/bsp/bpi-meson-g12b/usr/local/bin/hdmi_setup.sh
View File

@ -20,7 +20,7 @@ sudo chmod 777 ${PIPE}
# Established timings supported
case "${VERSION_CODENAME}" in
"focal"|"buster"|"bullseye"|"jammy")
"focal"|"buster"|"bullseye"|"jammy"|"bookworm")
edid-decode < /sys/class/amhdmitx/amhdmitx0/rawedid | grep "E:" > $tempfile
while read line
do

2
packages/bsp/bpi-meson-sm1/usr/local/bin/hdmi_setup.sh
View File

@ -20,7 +20,7 @@ sudo chmod 777 ${PIPE}
# Established timings supported
case "${VERSION_CODENAME}" in
"focal"|"buster"|"bullseye"|"jammy")
"focal"|"buster"|"bullseye"|"jammy"|"bookworm")
edid-decode < /sys/class/amhdmitx/amhdmitx0/rawedid | grep "E:" > $tempfile
while read line
do

BIN
packages/extras-buildpkgs/bananapi/bpi-meson-g12b/common/bookworm/edid-decode_0.1~git20200331.11f97037_arm64.deb Normal file
View File

Binary file not shown.

BIN
packages/extras-buildpkgs/bananapi/bpi-meson-g12b/common/bookworm/wiringpi_3.8_arm64.deb Normal file
View File

Binary file not shown.

BIN
packages/extras-buildpkgs/bananapi/bpi-meson-sm1/common/bookworm/edid-decode_0.1~git20200331.11f97037_arm64.deb Normal file
View File

Binary file not shown.

BIN
packages/extras-buildpkgs/bananapi/bpi-meson-sm1/common/bookworm/wiringpi_3.8_arm64.deb Normal file
View File

Binary file not shown.