enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/igorpecovnik/lib

Browse Source
This commit is contained in:
Igor Pecovnik 2016-05-15 20:21:08 +02:00
commit f0f30c34bf
5 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
config/sources/odroidc2.conf
View File

@ -26,14 +26,14 @@ write_uboot_platform()
family_tweaks()
{
sed -i 's/MODULES=.*/MODULES="meson-ir"/' $CACHEDIR/sdcard/etc/lirc/hardware.conf
sed -i 's/LOAD_MODULES=.*/LOAD_MODULES="true"/' $CACHEDIR/sdcard/etc/lirc/hardware.conf
sed -i 's/DEVICE=.*/DEVICE="\/dev\/lirc0"/' $CACHEDIR/sdcard/etc/lirc/hardware.conf
sed -i 's/LIRCD_ARGS=.*/LIRCD_ARGS="--uinput"/' $CACHEDIR/sdcard/etc/lirc/hardware.conf
cp $SRC/lib/config/lirc.conf.odroidc2 $CACHEDIR/sdcard/etc/lirc/lircd.conf
install -m 755 $SRC/lib/scripts/c2_init.sh $CACHEDIR/sdcard/etc/
sed -e 's/exit 0//g' -i $CACHEDIR/sdcard/etc/rc.local
echo "/etc/c2_init.sh" >> $CACHEDIR/sdcard/etc/rc.local
echo "exit 0" >> $CACHEDIR/sdcard/etc/rc.local
}
sed -i 's/MODULES=.*/MODULES="meson-ir"/' $CACHEDIR/sdcard/etc/lirc/hardware.conf
sed -i 's/LOAD_MODULES=.*/LOAD_MODULES="true"/' $CACHEDIR/sdcard/etc/lirc/hardware.conf
sed -i 's/DEVICE=.*/DEVICE="\/dev\/lirc0"/' $CACHEDIR/sdcard/etc/lirc/hardware.conf
sed -i 's/LIRCD_ARGS=.*/LIRCD_ARGS="--uinput"/' $CACHEDIR/sdcard/etc/lirc/hardware.conf
cp $SRC/lib/config/lirc.conf.odroidc2 $CACHEDIR/sdcard/etc/lirc/lircd.conf
install -m 755 $SRC/lib/scripts/c2_init.sh $CACHEDIR/sdcard/etc/
sed -e 's/exit 0//g' -i $CACHEDIR/sdcard/etc/rc.local
echo "/etc/c2_init.sh" >> $CACHEDIR/sdcard/etc/rc.local
echo "exit 0" >> $CACHEDIR/sdcard/etc/rc.local
}

2
configuration.sh
View File

@ -136,7 +136,7 @@ case $RELEASE in
;;
xenial)
PACKAGE_LIST_RELEASE="man-db wget iptables nano thin-provisioning-tools libnl-genl-3-dev libpam-systemd \
software-properties-common python-software-properties libnss-myhostname f2fs-tools"
software-properties-common libnss-myhostname f2fs-tools"
PACKAGE_LIST_DESKTOP="$PACKAGE_LIST_DESKTOP libreoffice-writer thunderbird firefox gnome-icon-theme-full tango-icon-theme gvfs-backends \
policykit-1 xserver-xorg-video-fbdev"
PACKAGE_LIST_EXCLUDE=""

7
debootstrap-ng.sh
View File

@ -211,6 +211,13 @@ create_rootfs_cache()
#[[ ${PIPESTATUS[0]} -ne 0 ]] && exit_with_error "Updating package lists failed"
# debootstrap in trusty fails to configure all packages, run apt-get to fix them
[[ $RELEASE == xenial ]] && eval 'LC_ALL=C LANG=C chroot $CACHEDIR/sdcard /bin/bash -c \
"DEBIAN_FRONTEND=noninteractive apt-get -y -q $apt_extra $apt_extra_progress install -f"' \
${PROGRESS_LOG_TO_FILE:+' | tee -a $DEST/debug/debootstrap.log'} \
${OUTPUT_DIALOG:+' | dialog --backtitle "$backtitle" --progressbox "Configure base packages..." $TTY_Y $TTY_X'} \
${OUTPUT_VERYSILENT:+' >/dev/null 2>/dev/null'}
# stage: upgrade base packages from xxx-updates and xxx-backports repository branches
display_alert "Upgrading base packages" "Armbian" "info"
eval 'LC_ALL=C LANG=C chroot $CACHEDIR/sdcard /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt-get -y -q \

2
general.sh
View File

@ -289,7 +289,7 @@ prepare_host() {
PAK="ca-certificates device-tree-compiler pv bc lzop zip binfmt-support build-essential ccache debootstrap ntpdate pigz \
gawk gcc-arm-linux-gnueabihf gcc-arm-linux-gnueabi qemu-user-static u-boot-tools uuid-dev zlib1g-dev unzip libusb-1.0-0-dev ntpdate \
parted pkg-config libncurses5-dev whiptail debian-keyring debian-archive-keyring f2fs-tools libfile-fcntllock-perl rsync libssl-dev \
nfs-kernel-server btrfs-tools gcc-aarch64-linux-gnu ncurses-term p7zip-full dos2unix"
nfs-kernel-server btrfs-tools gcc-aarch64-linux-gnu ncurses-term p7zip-full dos2unix dosfstools"
# warning: apt-cacher-ng will fail if installed and used both on host and in container/chroot environment with shared network
# set NO_APT_CACHER=yes to prevent installation errors in such case

8
scripts/update-motd.d/40-updates
View File

@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python3
#
# 40-updates - create the list of packages for update with caching
# Copyright (c) 2015 Igor Pecovnik
@ -59,7 +59,7 @@ def refreshdata ():
# open the apt cache
try:
cache = apt_pkg.Cache(OpNullProgress())
except SystemError, e:
except SystemError as e:
sys.stderr.write("Error: Opening the cache (%s)" % e)
sys.exit(-1)
@ -87,7 +87,7 @@ def refreshdata ():
# then a standard upgrade
depcache.upgrade()
except SystemError, e:
except SystemError as e:
sys.stderr.write("Error: Couldn't mark the upgrade (%s)" % e)
sys.exit(-1)
@ -146,7 +146,7 @@ else:
file = open(myfile, 'r+')
updates = int(file.read())
if updates > 0:
print "[ \033[92m%d updates to install\033[0m: apt-get upgrade ]\n" % (updates)
print("[ \033[92m%d updates to install\033[0m: apt-get upgrade ]\n" % (updates))