FOGProject/fos
1
0
Fork 0
mirror of https://github.com/FOGProject/fos.git synced 2026-04-19 01:00:43 -05:00
Code Issues Packages Projects Releases 20 Wiki Activity

Merge branch 'master' into http-stream-deploy

Browse Source
This commit is contained in:
Tom Elliott
2018-02-09 15:13:26 -05:00
parent 18b28a5757 e604d02cc4
commit 2cc55ff09d
4 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build.sh
View File

@@ -180,6 +180,8 @@ function buildFilesystem() {
fi
cd fssource$arch
echo "your working dir is $PWD"
bash -c "while true; do echo \$(date) - building ...; sleep 30s; done" &
PING_LOOP_PID=$!
if [[ $confirm != n ]]; then
read -p "We are ready to build. Would you like to edit the config file [y|n]?" config
if [[ $config == y ]]; then
@@ -191,16 +193,18 @@ function buildFilesystem() {
read -p "We are ready to build are you [y|n]?" ready
if [[ $ready == y ]]; then
echo "This make take a long time. Get some coffee, you'll be here a while!"
make -j $(nproc)
make -j $(nproc) >buildroot$arch.log
else
echo "Nothing to build!? Skipping."
cd ..
return
fi
else
make oldconfig && make
make oldconfig
make -j $(nproc) >buildroot$arch.log
fi
cd ..
kill $PING_LOOP_PID
[[ ! -d dist ]] && mkdir dist
compiledfile="fssource$arch/output/images/rootfs.ext4.xz"
[[ $arch == x64 ]] && initfile='dist/init.xz' || initfile='dist/init_32.xz'

5
configs/fsx64.config
View File

@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Buildroot 2017.11.2-g6e70b12-dirty Configuration
# Buildroot 2017.11.2-gb3720a6 Configuration
#
BR2_HAVE_DOT_CONFIG=y
BR2_HOST_GCC_AT_LEAST_4_5=y
@@ -1442,7 +1442,8 @@ BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS=y
# BR2_PACKAGE_DAWGDIC is not set
# BR2_PACKAGE_DING_LIBS is not set
# BR2_PACKAGE_EIGEN is not set
# BR2_PACKAGE_ELFUTILS is not set
BR2_PACKAGE_ELFUTILS=y
BR2_PACKAGE_ELFUTILS_PROGS=y
# BR2_PACKAGE_FFTW is not set
# BR2_PACKAGE_FLANN is not set
# BR2_PACKAGE_GFLAGS is not set

5
configs/fsx86.config
View File

@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Buildroot 2017.11.2 Configuration
# Buildroot 2017.11.2-gb3720a6 Configuration
#
BR2_HAVE_DOT_CONFIG=y
BR2_HOST_GCC_AT_LEAST_4_5=y
@@ -1450,7 +1450,8 @@ BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS=y
# BR2_PACKAGE_DAWGDIC is not set
# BR2_PACKAGE_DING_LIBS is not set
# BR2_PACKAGE_EIGEN is not set
# BR2_PACKAGE_ELFUTILS is not set
BR2_PACKAGE_ELFUTILS=y
BR2_PACKAGE_ELFUTILS_PROGS=y
# BR2_PACKAGE_FFTW is not set
# BR2_PACKAGE_FLANN is not set
# BR2_PACKAGE_GFLAGS is not set

4
docker/Dockerfile
View File

@@ -2,11 +2,11 @@ FROM debian:9
LABEL maintainer="contact@fogproject.org"
RUN apt-get update && DEBIAN_FRONTEND=noninteractive\
apt-get install -y wget subversion git mercurial meld build-essential rsync libncurses-dev gcc-multilib cpio bc unzip locales texinfo
apt-get install -y wget subversion git mercurial meld build-essential rsync libncurses-dev gcc-multilib cpio bc unzip locales texinfo libelf-dev
RUN rm -rf /var/lib/apt/lists/* \
&& localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
ENV LANG en_US.utf8
RUN adduser --disabled-password --uid 1000 --gecos "Docker Builder,,," builder
WORKDIR /home/builder
WORKDIR /home/builder