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

Misc fixes / improvements

Browse source
This commit is contained in:
Alexandre Aubin 2018-04-26 18:17:56 +02:00
parent cd1f848277
commit 38122c6e93
4 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
images/make-images
View file

@ -17,6 +17,10 @@ function build_image()
local ARCH=$1 local ARCH=$1
local CHROOT=chroot-${DISTRIB}-${ARCH} local CHROOT=chroot-${DISTRIB}-${ARCH}
echo ""
echo "Starting build for $ARCH"
echo ""
cd /tmp/ cd /tmp/
cdebootstrap --arch=${ARCH} --foreign ${DISTRIB} ./$CHROOT http://deb.debian.org/debian/ cdebootstrap --arch=${ARCH} --foreign ${DISTRIB} ./$CHROOT http://deb.debian.org/debian/
cp /usr/bin/qemu-arm-static $CHROOT/usr/bin/ cp /usr/bin/qemu-arm-static $CHROOT/usr/bin/
@ -35,6 +39,10 @@ function build_image()
cd $CHROOT cd $CHROOT
tar -czf $INIT_DIR/${DISTRIB}-${ARCH}.tgz ./* tar -czf $INIT_DIR/${DISTRIB}-${ARCH}.tgz ./*
echo ""
echo "Output image should be available as $INIT_DIR/${DISTRIB}-${ARCH}.tgz"
echo ""
} }
main main

1
init.sh
View file

@ -16,6 +16,7 @@ source config/config
gpg --import config/keys/$DEBSIGN_KEYID.key gpg --import config/keys/$DEBSIGN_KEYID.key
gpg --import config/keys/$DEBSIGN_KEYID.pub gpg --import config/keys/$DEBSIGN_KEYID.pub
mkdir gitrepos
cd gitrepos/ cd gitrepos/
git clone https://github.com/yunohost/yunohost git clone https://github.com/yunohost/yunohost
git clone https://github.com/yunohost/yunohost-admin git clone https://github.com/yunohost/yunohost-admin

2
scripts/build_deb
View file

@ -92,7 +92,7 @@ echo "Building source package of ${package}_${version}..."
if $BUILD_SRC_LOCALLY; then if $BUILD_SRC_LOCALLY; then
debuild -S -sa > /dev/null debuild -S -sa > /dev/null
else else
img="${PBUILDER_IMAGES}/amd64/${CODENAME}.tgz" img="${PBUILDER_IMAGES}/${CODENAME}-amd64.tgz"
sudo pbuilder execute --bindmounts ${ROOT_DIR} \ sudo pbuilder execute --bindmounts ${ROOT_DIR} \
--basetgz ${img} -- ${BUILD_SOURCES} $PKG_DIR --basetgz ${img} -- ${BUILD_SOURCES} $PKG_DIR
fi fi

2
scripts/rebuildd/build-binaries
View file

@ -34,7 +34,7 @@ echo "######################"
# Format needed pbuilder arguments # Format needed pbuilder arguments
DEBBUILDOPTS="$DEBBUILDOPTS -j$JOBS" DEBBUILDOPTS="$DEBBUILDOPTS -j$JOBS"
DSC_FILE="${package}_${version}.dsc" DSC_FILE="${package}_${version}.dsc"
BASE_TGZ="${PBUILDER_IMAGES}/${arch}/${codename}.tgz" BASE_TGZ="${PBUILDER_IMAGES}/${codename}-${arch}.tgz"
EXTRA_OPTS=() EXTRA_OPTS=()
CONFIGFILE="" CONFIGFILE=""