From c19a5effdc8798296c43fa6d9a751804cd761690 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 5 Feb 2021 01:18:01 +0000 Subject: [PATCH] Add support for bullseye builds --- chroots/make-chroots | 10 ++++++++-- config/config | 3 +-- config/distributions | 14 ++++++++++++++ config/rebuildd.conf | 2 +- config/rebuildd.default | 2 +- daily-build | 6 ++++-- init.sh | 1 - scripts/build_deb | 4 ++-- scripts/pbuilder/hooks/D80patch-yunohost-admin | 4 ++-- scripts/ynh-custom-builds | 5 +++-- 10 files changed, 36 insertions(+), 15 deletions(-) diff --git a/chroots/make-chroots b/chroots/make-chroots index 52eb617..cb6b3f1 100755 --- a/chroots/make-chroots +++ b/chroots/make-chroots @@ -1,7 +1,9 @@ #!/bin/bash -# For some reason, building chroots for buster from stretch requires libdebian-installer4 0.119 instead of 0.110, c.f. https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=904699 ... installed it by manually downloading and dpkg -i the .deb -readonly DISTRIB=buster +# For some reason, building chroots for buster from stretch requires libdebian-installer4 0.119 instead of 0.110 +# c.f. https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=904699 ... installed it by manually downloading and dpkg -i the .deb + +readonly DISTRIB=bullseye readonly INIT_DIR=$PWD readonly ARCHS="amd64" #readonly ARCHS="i386 armhf armel arm64" @@ -34,6 +36,10 @@ function build_chroot() chroot $CHROOT apt dist-upgrade chroot $CHROOT apt install -y build-essential debhelper cmake wget devscripts git aptitude + # Install build depends for yunohost etc + chroot $CHROOT apt install -y debhelper devscripts dh-python python3-all python3-yaml python3-jinja2 python3-setuptools python3-psutil + chroot $CHROOT apt install -y lua5.1 liblua5.1-dev libidn11-dev libssl-dev txt2man quilt + if [ "$ARCH" == "amd64" ]; then # This is for building yunohost-admin diff --git a/config/config b/config/config index 8587e9e..334b60c 100644 --- a/config/config +++ b/config/config @@ -10,11 +10,10 @@ REPO_URL="forge.yunohost.org" # Codenames, components and architectures -AVAILABLE_CODENAMES="stretch buster" +AVAILABLE_CODENAMES="stretch buster bullseye" AVAILABLE_COMPONENTS="stable testing unstable extra" AVAILABLE_ARCH="amd64 i386 armel armhf arm64" -DEFAULT_CODENAME="stretch" DEFAULT_COMPONENT="unstable" DEFAULT_ARCH="amd64" diff --git a/config/distributions b/config/distributions index 452ca34..47f1d07 100644 --- a/config/distributions +++ b/config/distributions @@ -25,3 +25,17 @@ SignWith: 59A3E6FF Tracking: all includechanges keepsources Log: logfile --changes --via=include /home/vinaigrette/scripts/repo/process-include + +Origin: YunoHost +Label: YunoHost for Bullseye +Suite: stable +Codename: bullseye +Version: 11.0 +Architectures: i386 amd64 armel armhf arm64 source +Components: stable testing unstable extra +AlsoAcceptFor: bullseye-stable bullseye-testing bullseye-unstable stable testing unstable +Description: YunoHost repository for Debian Bullseye +SignWith: 59A3E6FF +Tracking: all includechanges keepsources +Log: logfile + --changes --via=include /home/vinaigrette/scripts/repo/process-include diff --git a/config/rebuildd.conf b/config/rebuildd.conf index 3e61eb9..692baad 100644 --- a/config/rebuildd.conf +++ b/config/rebuildd.conf @@ -6,7 +6,7 @@ kill_timeout = 90 source_cmd = /home/vinaigrette/scripts/rebuildd/get-sources ${d} ${p} ${v} build_cmd = /home/vinaigrette/scripts/rebuildd/build-binaries ${d} ${p} ${v} ${a} post_build_cmd = /home/vinaigrette/scripts/rebuildd/upload-binaries ${d} ${p} ${v} ${a} ${j} -dists = stretch buster +dists = stretch buster bullseye work_dir = /var/cache/rebuildd/build database_uri = sqlite:///var/lib/rebuildd/rebuildd.db build_more_recent = 1 diff --git a/config/rebuildd.default b/config/rebuildd.default index b1568f7..5d1524e 100644 --- a/config/rebuildd.default +++ b/config/rebuildd.default @@ -4,5 +4,5 @@ PBUILDER_BIN=/usr/sbin/pbuilder PBUILDER_CACHE_PATH="/var/cache/pbuilder" PBUILDER_MIRROR=https://ftp.debian.org/debian ARCHS="amd64 i386 armel armhf arm64" -DISTS="stretch buster" +DISTS="stretch buster bullseye" ENABLE_BUILDER_MAINT=1 diff --git a/daily-build b/daily-build index aa9d530..f657ca2 100755 --- a/daily-build +++ b/daily-build @@ -1,8 +1,7 @@ #!/bin/bash readonly THISSCRIPT=$0 -readonly BRANCH_NIGHTLY="dev" -readonly DISTRIBS="buster" +readonly DISTRIBS="buster bullseye" readonly TIMETAG="$(date +%Y%m%d%H%M)" readonly PACKAGES="moulinette SSOwat yunohost yunohost-admin" readonly FORCE="false" @@ -44,6 +43,9 @@ function build_if_needed() local DISTRIB=$2 local LAST_BUILD_FOR_THIS_PACKAGE=$LAST_BUILDS_CACHE/${DISTRIB}_${PACKAGE} + BRANCH_NIGHTLY="$DISTRIB" + [[ $DISTRIB == "buster" ]] && BRANCH_NIGHTLY="dev" + cd $GIT_REPOS/$PACKAGE git fetch origin >/dev/null 2>/dev/null diff --git a/init.sh b/init.sh index 3ac6e89..472eb57 100755 --- a/init.sh +++ b/init.sh @@ -53,7 +53,6 @@ cat $VINAIGRETTE_HOME/config/sources.list > /etc/apt/sources.list.d/vinaigrette. sed -i "s/__REPO_URL__/$REPO_URL/g" /etc/nginx/sites-enabled/repo.conf sed -i "s/__REPO_URL__/$REPO_URL/g" /etc/apt/sources.list.d/vinaigrette.list -echo "deb https://deb.nodesource.com/node_6.x stretch main" >> /etc/apt/sources.list echo "127.0.0.1 $REPO_URL" >> /etc/hosts service nginx reload diff --git a/scripts/build_deb b/scripts/build_deb index 284f06d..1c5eaca 100755 --- a/scripts/build_deb +++ b/scripts/build_deb @@ -26,7 +26,7 @@ Usage: $THISSCRIPT Arguments: - stretch or buster + stretch or buster or bullseye stable, testing, or unstable the folder in which to build... EOF @@ -50,7 +50,7 @@ function main() function validate_arguments() { - [[ $DISTRIB =~ ^stretch|buster$ ]] || critical "Invalid distribution $DISTRIB" + [[ $DISTRIB =~ ^stretch|buster|bullseye$ ]] || critical "Invalid distribution $DISTRIB" [[ $BRANCH =~ ^testing|stable|unstable$ ]] || critical "Invalid branch $BRANCH" [[ ! -z "$FOLDER" ]] || critical "Need a folder in which to build" } diff --git a/scripts/pbuilder/hooks/D80patch-yunohost-admin b/scripts/pbuilder/hooks/D80patch-yunohost-admin index 7e1632e..cca4ca8 100755 --- a/scripts/pbuilder/hooks/D80patch-yunohost-admin +++ b/scripts/pbuilder/hooks/D80patch-yunohost-admin @@ -10,7 +10,7 @@ if ls -d /build/yunohost-admin* >dev/null 2>&1 then echo "======================================================" DIST="$(cat /etc/os-release | grep CODENAME= | cut -d = -f 2)" - if [ "$DIST" != "buster" ] + if [ "$DIST" == "stretch" ] then /usr/bin/apt-get install git nodejs -y echo "========================" @@ -49,7 +49,7 @@ EOF mkdir /nonexistent chown pbuilder:pbuilder /nonexistent cd /build/yunohost-admin*/app - if [ "$DIST" != "buster" ] + if [ "$DIST" == "stretch" ] then su pbuilder -c "npm install" else diff --git a/scripts/ynh-custom-builds b/scripts/ynh-custom-builds index e782cc5..51c569c 100755 --- a/scripts/ynh-custom-builds +++ b/scripts/ynh-custom-builds @@ -3,9 +3,10 @@ readonly THISSCRIPT=$0 readonly PACKAGE=$1 readonly BRANCH=$2 -readonly DISTRIB="buster" +readonly DISTRIB="bullseye" +#readonly DISTRIB="buster" #readonly DISTRIB="stretch" -readonly DISTRIB_N="10" +readonly DISTRIB_N="11" source /home/vinaigrette/config/config source /home/vinaigrette/scripts/common.sh