free
/
freedomboneeee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Configure backports and contrib repo before update

This commit is contained in:
Bob Mottram 2016-08-13 10:12:23 +01:00
parent 87f9e68933
commit e07c8eb2a5
No known key found for this signature in database
GPG Key ID: 0452CC7CEA982E38
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/freedombone-app-ipfs
View File

@ -206,6 +206,7 @@ function mesh_install_ipfs_js {
return return
fi fi
chroot ${rootdir} apt-get -y install nodejs
chroot ${rootdir} apt-get -y install npm chroot ${rootdir} apt-get -y install npm
chroot ${rootdir} apt-get -y install libpam0g-dev fuse chroot ${rootdir} apt-get -y install libpam0g-dev fuse
@ -273,6 +274,7 @@ function install_ipfs_js {
return return
fi fi
apt-get -y install nodejs
apt-get -y install npm apt-get -y install npm
apt-get -y install libpam0g-dev fuse apt-get -y install libpam0g-dev fuse

21
src/freedombone-image-customise
View File

@ -116,6 +116,16 @@ MESH_SET_USERNAME=$"Welcome to the Freedombone mesh.\n\nThe first thing you will
# Whether to enable zeronet on the mesh # Whether to enable zeronet on the mesh
ENABLE_ZERONET= ENABLE_ZERONET=
function configure_backports {
echo "deb http://${DEBIAN_REPO}/debian/ ${DEBIAN_VERSION}-backports main" >> $rootdir/etc/apt/sources.list
}
function configure_contrib_repo {
if ! grep -q "contrib" $rootdir/etc/apt/sources.list; then
chroot "$rootdir" sed -i "s| main| main contrib|g" /etc/apt/sources.list
fi
}
enable_eatmydata_override() { enable_eatmydata_override() {
chroot $rootdir apt-get install --no-install-recommends -y eatmydata chroot $rootdir apt-get install --no-install-recommends -y eatmydata
if [ -x $rootdir/usr/bin/eatmydata ] && \ if [ -x $rootdir/usr/bin/eatmydata ] && \
@ -530,11 +540,6 @@ initialise_mesh() {
chroot "$rootdir" sed -i "s| main| main non-free|g" /etc/apt/sources.list chroot "$rootdir" sed -i "s| main| main non-free|g" /etc/apt/sources.list
fi fi
# enable contrib repo
if ! grep -q "contrib" $rootdir/etc/apt/sources.list; then
chroot "$rootdir" sed -i "s| main| main contrib|g" /etc/apt/sources.list
fi
chroot "$rootdir" apt-get update chroot "$rootdir" apt-get update
# install proprietary wifi drivers # install proprietary wifi drivers
@ -692,10 +697,6 @@ function configure_user_interface {
DEBIAN_VERSION='jessie' DEBIAN_VERSION='jessie'
fi fi
# install backports
echo "deb http://${DEBIAN_REPO}/debian/ ${DEBIAN_VERSION}-backports main" >> $rootdir/etc/apt/sources.list
chroot "$rootdir" apt-get -y update
# desktop # desktop
chroot "$rootdir" apt-get -y install mate-desktop-environment chroot "$rootdir" apt-get -y install mate-desktop-environment
@ -837,6 +838,8 @@ set_apt_sources $BUILD_MIRROR
chroot "$rootdir" apt-get clean chroot "$rootdir" apt-get clean
chroot "$rootdir" rm -rf /var/lib/apt/lists/* chroot "$rootdir" rm -rf /var/lib/apt/lists/*
chroot "$rootdir" apt-get clean chroot "$rootdir" apt-get clean
configure_backports
configure_contrib_repo
chroot "$rootdir" apt-get update chroot "$rootdir" apt-get update
cat > $rootdir/usr/sbin/policy-rc.d <<EOF cat > $rootdir/usr/sbin/policy-rc.d <<EOF