GitHub-Mirror/build
2
0
Fork 0
mirror of https://github.com/Fishwaldo/build.git synced 2025-04-03 12:41:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
zador-blood-stained 2016-03-13 11:56:01 +03:00
commit f7c06407ed
2 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/armhwinfo
View file

@ -84,9 +84,9 @@ detect_board() {
elif [ "$LEDS" != "" ]; then elif [ "$LEDS" != "" ]; then
ID="Lime 2" ID="Lime 2"
elif [ "$WIFIAP6211" != "" ]; then elif [ "$WIFIAP6211" != "" ]; then
ID="Banana PRO" ID="Banana Pi Pro"
else else
ID="Banana" ID="Banana Pi"
fi fi
elif [ "$LEDS" != "" ]; then elif [ "$LEDS" != "" ]; then
ID="Lime" ID="Lime"
@ -196,14 +196,14 @@ detect_board() {
if [[ $MACHINE == *LIME2 ]]; then ID="Lime 2"; fi if [[ $MACHINE == *LIME2 ]]; then ID="Lime 2"; fi
if [[ $MACHINE == *LIME ]]; then ID="Lime"; fi if [[ $MACHINE == *LIME ]]; then ID="Lime"; fi
if [[ $MACHINE == *Micro ]]; then ID="Micro"; fi if [[ $MACHINE == *Micro ]]; then ID="Micro"; fi
if [[ $MACHINE == *Banana* ]]; then ID="Banana"; fi if [[ $MACHINE == *Banana* ]]; then ID="Banana Pi"; fi
if [[ $MACHINE == *Udoo* ]]; then ID="udoo"; fi if [[ $MACHINE == *Udoo* ]]; then ID="udoo"; fi
if [[ $MACHINE == *Lamobo* ]]; then ID="Lamobo R1"; fi if [[ $MACHINE == *Lamobo* ]]; then ID="Lamobo R1"; fi
if [[ $MACHINE == *Neo* ]]; then ID="Udoo Neo"; fi if [[ $MACHINE == *Neo* ]]; then ID="Udoo Neo"; fi
if [[ $MACHINE == *Cubietruck* ]]; then ID="Cubietruck"; fi if [[ $MACHINE == *Cubietruck* ]]; then ID="Cubietruck"; fi
if [[ $MACHINE == *Cubieboard* ]]; then ID="Cubieboard"; fi if [[ $MACHINE == *Cubieboard* ]]; then ID="Cubieboard"; fi
if [[ $MACHINE == *Pro* ]]; then ID="Banana Pro"; fi if [[ $MACHINE == *Pro* ]]; then ID="Banana Pi Pro"; fi
if [[ $MACHINE == *M2* ]]; then ID="Banana M2"; fi if [[ $MACHINE == *M2* ]]; then ID="Banana Pi M2"; fi
} # detect_board } # detect_board
log_hardware_info() { log_hardware_info() {

29
scripts/firstrun
View file

@ -94,16 +94,11 @@ display_alert() {
fi fi
} }
autodetect_a20() { autodetect_sunxi() {
sleep 3
MACHINE="$(tail -n1 /run/machine.id)"
}
autodetect_h3() {
# This function adjusts script.bin, hostname and cpufreq settings based on # This function adjusts script.bin, hostname and cpufreq settings based on
# /run/machine.id so that two OS images (one built for GbE H3 devices like # /run/machine.id so that two OS images (one built for GbE H3 devices like
# Orange Pi Plus or Banana Pi M2+ and one for the other H3 devices using # Orange Pi Plus or Banana Pi M2+ and one for the other H3 devices using
# the internal Ethernet PHY) can be shipped. # the internal Ethernet PHY or Banana Pro vs. Pi) can be shipped.
# #
# TODO for mainline kernel: Ship with u-boot debs for all Oranges and install # TODO for mainline kernel: Ship with u-boot debs for all Oranges and install
# the right one instead of trying to relink script.bin if detecting mainline # the right one instead of trying to relink script.bin if detecting mainline
@ -121,6 +116,9 @@ autodetect_h3() {
ScriptBinName="$(echo "${NEWHOSTNAME}" | sed -e 's/2mini$/2/g' -e 's/plus2$/plus/g').bin" ScriptBinName="$(echo "${NEWHOSTNAME}" | sed -e 's/2mini$/2/g' -e 's/plus2$/plus/g').bin"
ScriptBinUsed="$(readlink -f "/boot/script.bin")" ScriptBinUsed="$(readlink -f "/boot/script.bin")"
case ${MACHINE} in case ${MACHINE} in
"Banana Pi")
ln -sf /boot/bin/bananapi.bin /boot/script.bin
;;
"Orange Pi+"*) "Orange Pi+"*)
if [ "X${ScriptBinName}" != "X${ScriptBinUsed##*/}" ]; then if [ "X${ScriptBinName}" != "X${ScriptBinUsed##*/}" ]; then
# wrong detection due to disabled Ethernet on 1st boot # wrong detection due to disabled Ethernet on 1st boot
@ -152,13 +150,14 @@ autodetect_h3() {
fi fi
;; ;;
esac esac
echo "${NEWHOSTNAME}" >/etc/hostname echo "${NEWHOSTNAME}" >/etc/hostname
sed -i "s/orangepih3/${NEWHOSTNAME}/" /etc/hosts sed -i -e "s/^::1 localhost.*/::1 localhost ${NEWHOSTNAME} ip6-localhost ip6-loopback/" \
-e "s/^127.0.0.1 localhost.*/127.0.0.1 localhost ${NEWHOSTNAME}/" /etc/hosts
[ -f /etc/wicd/wired-settings.conf ] && \ [ -f /etc/wicd/wired-settings.conf ] && \
sed -i "s/^dhcphostname =.*/dhcphostname = ${NEWHOSTNAME}/" /etc/wicd/wired-settings.conf sed -i "s/^dhcphostname =.*/dhcphostname = ${NEWHOSTNAME}/" /etc/wicd/wired-settings.conf
rm /boot/bin/orangepih3.bin [ -f /boot/bin/orangepih3.bin ] && rm /boot/bin/orangepih3.bin
touch /var/run/reboot touch /var/run/reboot
} # autodetect_h3 } # autodetect_sunxi
do_expand_rootfs() { do_expand_rootfs() {
device="/dev/"$(lsblk -idn -o NAME | grep mmcblk0) device="/dev/"$(lsblk -idn -o NAME | grep mmcblk0)
@ -203,14 +202,10 @@ main() {
display_alert "Updating packages" display_alert "Updating packages"
/tmp/create_swap.sh & /tmp/create_swap.sh &
if [ "X${HARDWARE}" = "Xsun8i" ]; then if [ "X${HARDWARE}" = "Xsun8i" -o "X${HARDWARE}" = "Xsun7i" ]; then
autodetect_h3 autodetect_sunxi
fi fi
if [ "X${HARDWARE}" = "Xsun7i" ]; then
autodetect_a20
fi
update-rc.d -f firstrun remove >/dev/null 2>&1 update-rc.d -f firstrun remove >/dev/null 2>&1
sed -i 's/allow-hotplug\ eth0/auto eth0/' /etc/network/interfaces.default sed -i 's/allow-hotplug\ eth0/auto eth0/' /etc/network/interfaces.default
} # main } # main