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

Cosmetics / adjusment / fixes when running on stretch...

Browse source
This commit is contained in:
Alexandre Aubin 2018-03-03 19:51:54 +01:00
parent cdf3dcd781
commit 7a36ea2e0e
2 changed files with 52 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
build-yunohost
View file

@ -28,23 +28,41 @@ function build
sed -i "s#$REPO_URL jessie stable testing#$REPO_URL $DEB_DIST stable#" profiles/*.preseed sed -i "s#$REPO_URL jessie stable testing#$REPO_URL $DEB_DIST stable#" profiles/*.preseed
sed -i "s#$REPO_URL stretch stable testing#$REPO_URL $DEB_DIST stable#" profiles/*.preseed sed -i "s#$REPO_URL stretch stable testing#$REPO_URL $DEB_DIST stable#" profiles/*.preseed
fi fi
# Build a simple/regular debian CD image ?
build-simple-cdd --dist $DEB_DIST --conf ./simple-cdd-$ARCH.conf build-simple-cdd --dist $DEB_DIST --conf ./simple-cdd-$ARCH.conf
# Find the release version of debian # Find the release version of debian
local DEBNUM="$(grep "Version:" tmp/${DEB_DIST}_Release | awk '{print $2;}')" local DEBNUM="$(grep "Version:" tmp/${DEB_DIST}_Release | awk '{print $2;}')"
# Find the release version of YunoHost # Find the release version of YunoHost
wget ${REPO_URL}dists/${DEB_DIST}/${DIST}/binary-i386/Packages.gz info "Finding out current YunoHost's stable vesion number"
wget -q ${REPO_URL}dists/${DEB_DIST}/${DIST}/binary-i386/Packages.gz
gunzip Packages.gz gunzip Packages.gz
YNH_VERSION=$(grep "^Package: yunohost$" --after-context=1 Packages | grep "Version" | awk '{print $2;}') YNH_VERSION=$(grep "^Package: yunohost$" --after-context=1 Packages | grep "Version" | awk '{print $2;}')
rm -f Packages rm -f Packages
rm -f images/yunohost-$DEB_DIST-$YNH_VERSION-$ARCH-$DIST.iso local CD_STUFF="images/debian-$DEBNUM-$ARCH-CD"
$(pwd)/add-firmware-to images/debian-$DEBNUM-$ARCH-CD-1.iso images/yunohost-$DEB_DIST-$YNH_VERSION-$ARCH-$DIST.iso $DEB_DIST
rm -f images/debian-$DEBNUM-$ARCH-CD-1.iso
rm -f images/debian-$DEBNUM-$ARCH-CD-1.list.gz
success "The image should now be available in images/yunohost-$DEB_DIST-$YNH_VERSION-$ARCH-$DIST.iso"
# build-simple-cdd is stupid and doesn't name its output correctly -.- ...
mv images/debian-*-$ARCH-CD-1.iso $CD_STUFF.iso
mv images/debian-*-$ARCH-CD-1.list.gz $CD_STUFF.list.gz
local OUTPUT="images/yunohost-$DEB_DIST-$YNH_VERSION-$ARCH-$DIST.iso"
[ -e "$CD_STUFF.iso" ] \
|| critical "Expected to find $CD_STUFF.iso but it's not here ?"
rm -f $OUTPUT
$(pwd)/add-firmware-to $CD_STUFF.iso $OUTPUT $DEB_DIST
rm -f $CD_STUFF.iso
rm -f $CD_STUFF.list.gz
[ -e $OUTPUT ] \
&& success "The image should now be available in $OUTPUT" \
|| critical "Something wrong happened when build the image :|"
} }
# Sign the new iso # Sign the new iso
@ -56,7 +74,7 @@ function sign
info "Signing image $NAME ..." info "Signing image $NAME ..."
gpg --output $NAME.sig --detach-sig $NAME sudo gpg --output $NAME.sig --detach-sig $NAME
sha256sum $NAME > $NAME.sum sha256sum $NAME > $NAME.sum
} }
@ -64,13 +82,21 @@ function build_and_sign
{ {
local ARCH="$1" local ARCH="$1"
rm -r $(pwd)/tmp rm -rf $(pwd)/tmp
rm -rf $(pwd)/images/debian*
build $ARCH build $ARCH
sign $ARCH sign $ARCH
} }
function assert_not_root
{
[[ $EUID -ne 0 ]] || critical "You should not run this script as root !"
}
function main function main
{ {
assert_not_root
if [ -z "$ARCH_CHOICE" ] if [ -z "$ARCH_CHOICE" ]
then then
info "No arch chosen, will build both i396 and amd64" info "No arch chosen, will build both i396 and amd64"

21
common.sh
View file

@ -29,15 +29,24 @@ function info()
function warn() function warn()
{ {
local msg=${1} local msg=${1}
echo " " echo " " 2>&1
echo "[${BOLD}${ORANGE}WARN${NORMAL}] ${msg}" echo "[${BOLD}${ORANGE}WARN${NORMAL}] ${msg}" 2>&1
echo " " echo " " 2>&1
} }
function error() function error()
{ {
local msg=${1} local msg=${1}
echo " " echo " " 2>&1
echo "[${BOLD}${RED}FAIL${NORMAL}] ${msg}" echo "[${BOLD}${RED}FAIL${NORMAL}] ${msg}" 2>&1
echo " " echo " " 2>&1
}
function critical()
{
local msg=${1}
echo " " 2>&1
echo "[${BOLD}${RED}CRIT${NORMAL}] ${msg}" 2>&1
echo " " 2>&1
exit 1
} }