YunoHost/cd_build
1
0
Fork 0
mirror of https://github.com/YunoHost/cd_build.git synced 2024-09-03 20:06:24 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #11 from arthurlogilab/buster

Browse source 
[debian] replace stretch by buster
This commit is contained in:
Alexandre Aubin 2020-07-31 18:28:59 +02:00 • committed by GitHub
commit 66d5f333bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
add-firmware-to
View file

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash
# #
# add-firmware-to: Add non-free firmware to Debian install media # add-firmware-to: Add non-free firmware to Debian install media
# #
@ -25,7 +25,7 @@
# to add other archs upon request # to add other archs upon request
# 2008.??.?? - Initial creation, just works on initrds # 2008.??.?? - Initial creation, just works on initrds
# #
set -x set -x
is_iso() { is_iso() {
@ -99,7 +99,7 @@ if [ -e "$outfile" ]; then
fi fi
suite="$3" suite="$3"
if [ "$suite" != "stretch" ] && [ "$suite" != "jessie" ]; then if [ "$suite" != "buster" ] && [ "$suite" != "stretch" ]; then
echo "Unrecognized suite $suite, trying anyway." >&2 echo "Unrecognized suite $suite, trying anyway." >&2
fi fi
@ -130,7 +130,7 @@ if is_iso "$file"; then
for i in $(find "$buildtree" -name "initrd.gz" -o -name "initrd.img"); do for i in $(find "$buildtree" -name "initrd.gz" -o -name "initrd.img"); do
initrd_append_fw "$i" "$fwfile" "$i" initrd_append_fw "$i" "$fwfile" "$i"
done done
isolinuxpath="$(cd $buildtree && find . -name isolinux.bin | head -1 | cut -b 3-)" isolinuxpath="$(cd $buildtree && find . -name isolinux.bin | head -1 | cut -b 3-)"
genisoimage -r -J -b "$isolinuxpath" -c boot.cat \ genisoimage -r -J -b "$isolinuxpath" -c boot.cat \
-no-emul-boot -boot-load-size 4 -boot-info-table \ -no-emul-boot -boot-load-size 4 -boot-info-table \

2
auto_build.sh
View file

@ -58,7 +58,7 @@ compare_version () {
fi fi
} }
deb_dist=stretch deb_dist=buster
dist=stable dist=stable
compare_version "$(get_ynh_release)" compare_version "$(get_ynh_release)"

8
build-yunohost
View file

@ -2,9 +2,9 @@
# Usage ./build-yunohost [ARCH [DIST [DEB_DIST]]] # Usage ./build-yunohost [ARCH [DIST [DEB_DIST]]]
# ARCH amd64|i386 # ARCH amd64|i386
# DIST stable|testing # DIST stable|testing
# DEB_DIST stretch # DEB_DIST buster
readonly DEFAULT_DEB_DIST="stretch" readonly DEFAULT_DEB_DIST="buster"
readonly REPO_URL="http://forge.yunohost.org/debian/" readonly REPO_URL="http://forge.yunohost.org/debian/"
readonly ARCH_CHOICE=$1 readonly ARCH_CHOICE=$1
@ -22,9 +22,9 @@ function build
info "Starting build for arch $ARCH ..." info "Starting build for arch $ARCH ..."
if [ "$DIST" = "testing" ] ; then if [ "$DIST" = "testing" ] ; then
sed -i "s#$REPO_URL stretch stable#$REPO_URL $DEB_DIST stable testing#" profiles/*.preseed sed -i "s#$REPO_URL buster stable#$REPO_URL $DEB_DIST stable testing#" profiles/*.preseed
else else
sed -i "s#$REPO_URL stretch stable testing#$REPO_URL $DEB_DIST stable#" profiles/*.preseed sed -i "s#$REPO_URL buster stable testing#$REPO_URL $DEB_DIST stable#" profiles/*.preseed
fi fi
rm -rf $(pwd)/tmp rm -rf $(pwd)/tmp

2
profiles/default.preseed
View file

@ -69,7 +69,7 @@ d-i apt-setup/services-select multiselect security, updates
d-i apt-setup/security_host string security.debian.org d-i apt-setup/security_host string security.debian.org
d-i apt-setup/local0/repository string \ d-i apt-setup/local0/repository string \
http://forge.yunohost.org/debian/ stretch stable http://forge.yunohost.org/debian/ buster stable
d-i apt-setup/local0/key string http://forge.yunohost.org/yunohost.asc d-i apt-setup/local0/key string http://forge.yunohost.org/yunohost.asc
d-i apt-setup/local0/comment string YunoHost repository d-i apt-setup/local0/comment string YunoHost repository
#d-i debian-installer/allow_unauthenticated string true #d-i debian-installer/allow_unauthenticated string true