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

Tweaking architecture + a few minor things

Browse source
This commit is contained in:
Alexandre Aubin 2018-04-26 04:23:20 +02:00
parent a0f2534473
commit 6bf32044cb
5 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
config/config
View file

@ -10,11 +10,11 @@ REPO_URL="forge.yunohost.org"
# Codenames, components and architectures # Codenames, components and architectures
AVAILABLE_CODENAMES="jessie stretch" AVAILABLE_CODENAMES="stretch"
AVAILABLE_COMPONENTS="stable testing unstable extra" AVAILABLE_COMPONENTS="stable testing unstable extra"
AVAILABLE_ARCH="amd64 i386 armhf" AVAILABLE_ARCH="amd64 i386 armel armhf arm64"
DEFAULT_CODENAME="jessie" DEFAULT_CODENAME="stretch"
DEFAULT_COMPONENT="unstable" DEFAULT_COMPONENT="unstable"
DEFAULT_ARCH="amd64" DEFAULT_ARCH="amd64"
@ -22,7 +22,7 @@ DEFAULT_ARCH="amd64"
HOME_VINAIGRETTE="/home/vinaigrette" HOME_VINAIGRETTE="/home/vinaigrette"
GIT_REPOS="$HOME_VINAIGRETTE/gitrepos/" GIT_REPOS="$HOME_VINAIGRETTE/gitrepos/"
REPO_DIR=/var/www/repo/debian REPO_DIR="/var/www/repo/debian"
PBUILDER_HOME="$HOME_VINAIGRETTE/scripts/pbuilder/" PBUILDER_HOME="$HOME_VINAIGRETTE/scripts/pbuilder/"
PBUILDER_IMAGES="$HOME_VINAIGRETTE/images/" PBUILDER_IMAGES="$HOME_VINAIGRETTE/images/"

6
config/pbuilder/armel.conf Normal file
View file

@ -0,0 +1,6 @@
# ARM-specific configuration
DEBOOTSTRAP=debootstrap
#DEBOOTSTRAPOPTS=( '--variant=buildd' )
ARCHITECTURE=armel

2
config/rebuildd.conf
View file

@ -10,7 +10,7 @@ dists = jessie stretch
work_dir = /var/cache/rebuildd/build work_dir = /var/cache/rebuildd/build
database_uri = sqlite:///var/lib/rebuildd/rebuildd.db database_uri = sqlite:///var/lib/rebuildd/rebuildd.db
build_more_recent = 1 build_more_recent = 1
more_archs = i386 armhf arm64 all any more_archs = i386 armel armhf arm64 all any
no_system_arch = 0 no_system_arch = 0
[mail] [mail]

2
config/rebuildd.default
View file

@ -3,6 +3,6 @@ START_REBUILDD_HTTPD=1
PBUILDER_BIN=/usr/sbin/pbuilder PBUILDER_BIN=/usr/sbin/pbuilder
PBUILDER_CACHE_PATH="/var/cache/pbuilder" PBUILDER_CACHE_PATH="/var/cache/pbuilder"
PBUILDER_MIRROR=https://ftp.debian.org/debian PBUILDER_MIRROR=https://ftp.debian.org/debian
ARCHS="amd64 i386 armhf arm64" ARCHS="amd64 i386 armel armhf arm64"
DISTS="wheezy jessie stretch" DISTS="wheezy jessie stretch"
ENABLE_BUILDER_MAINT=1 ENABLE_BUILDER_MAINT=1

5
scripts/rebuildd/build-binaries
View file

@ -50,6 +50,11 @@ then
CONFIGFILE="--configfile $PBUILDER_CONF/armhf.conf" CONFIGFILE="--configfile $PBUILDER_CONF/armhf.conf"
fi fi
if [[ $arch == "armel" ]];
then
CONFIGFILE="--configfile $PBUILDER_CONF/armel.conf"
fi
if [[ $arch == "arm64" ]]; if [[ $arch == "arm64" ]];
then then
CONFIGFILE="--configfile $PBUILDER_CONF/arm64.conf" CONFIGFILE="--configfile $PBUILDER_CONF/arm64.conf"