pygos/build
1
0
Fork 0
mirror of https://github.com/pygos/build.git synced 2024-11-22 11:09:46 +01:00
Code Issues Releases Wiki Activity

Cleanup file override behaviour

Browse source 
Look for board specific product files in product/$product/$board/

Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
This commit is contained in:
David Oberhollenzer 2018-05-06 00:21:09 +02:00
parent b0a3baf8bb
commit 5388c0f925
7 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkg/init/build
View file

@ -34,6 +34,9 @@ deploy() {
if [ -e "$SCRIPTDIR/product/$PRODUCT/INIT" ]; then if [ -e "$SCRIPTDIR/product/$PRODUCT/INIT" ]; then
source "$SCRIPTDIR/product/$PRODUCT/INIT" source "$SCRIPTDIR/product/$PRODUCT/INIT"
fi fi
if [ -e "$SCRIPTDIR/product/$PRODUCT/$BOARD/INIT" ]; then
source "$SCRIPTDIR/product/$PRODUCT/$BOARD/INIT"
fi
if [ "x$HWCLOCK" == "xyes" ]; then if [ "x$HWCLOCK" == "xyes" ]; then
ln -s "/share/init/hwclock" "$DEPLOY/etc/init.d/hwclock" ln -s "/share/init/hwclock" "$DEPLOY/etc/init.d/hwclock"

0
product/router/dnsmasq.conf.alix → product/router/alix/dnsmasq.conf
View file

0
product/router/interfaces.alix/port0 → product/router/alix/interfaces/port0
View file

0
product/router/interfaces.alix/port1 → product/router/alix/interfaces/port1
View file

0
product/router/interfaces.alix/port2 → product/router/alix/interfaces/port2
View file

0
product/router/dnsmasq.conf.rpi3 → product/router/rpi3/dnsmasq.conf
View file

36
util/misc.sh
View file

@ -1,20 +1,18 @@
file_path_override() { file_path_override() {
local fname="$1" if [ -e "$SCRIPTDIR/product/$PRODUCT/$BOARD/$1" ]; then
echo "$SCRIPTDIR/product/$PRODUCT/$BOARD/$1"
if [ -e "$SCRIPTDIR/product/$PRODUCT/${fname}.${BOARD}" ]; then
echo "$SCRIPTDIR/product/$PRODUCT/${fname}.${BOARD}"
return return
fi fi
if [ -e "$SCRIPTDIR/product/$PRODUCT/$fname" ]; then if [ -e "$SCRIPTDIR/product/$PRODUCT/$1" ]; then
echo "$SCRIPTDIR/product/$PRODUCT/$fname" echo "$SCRIPTDIR/product/$PRODUCT/$1"
return return
fi fi
if [ -e "$SCRIPTDIR/board/$BOARD/$fname" ]; then if [ -e "$SCRIPTDIR/board/$BOARD/$1" ]; then
echo "$SCRIPTDIR/board/$BOARD/$fname" echo "$SCRIPTDIR/board/$BOARD/$1"
return return
fi fi
if [ -e "$SCRIPTDIR/product/common/$fname" ]; then if [ -e "$SCRIPTDIR/product/common/$1" ]; then
echo "$SCRIPTDIR/product/common/$fname" echo "$SCRIPTDIR/product/common/$1"
return return
fi fi
} }
@ -28,19 +26,17 @@ cat_file_override() {
} }
cat_file_merge() { cat_file_merge() {
local fname="$1" if [ -e "$SCRIPTDIR/product/$PRODUCT/$BOARD/$1" ]; then
cat "$SCRIPTDIR/product/$PRODUCT/$BOARD/$1"
if [ -e "$SCRIPTDIR/product/$PRODUCT/${fname}.${BOARD}" ]; then
cat "$SCRIPTDIR/product/$PRODUCT/${fname}.${BOARD}"
fi fi
if [ -e "$SCRIPTDIR/product/$PRODUCT/$fname" ]; then if [ -e "$SCRIPTDIR/product/$PRODUCT/$1" ]; then
cat "$SCRIPTDIR/product/$PRODUCT/$fname" cat "$SCRIPTDIR/product/$PRODUCT/$1"
fi fi
if [ -e "$SCRIPTDIR/board/$BOARD/$fname" ]; then if [ -e "$SCRIPTDIR/board/$BOARD/$1" ]; then
cat "$SCRIPTDIR/board/$BOARD/$fname" cat "$SCRIPTDIR/board/$BOARD/$1"
fi fi
if [ -e "$SCRIPTDIR/product/common/$fname" ]; then if [ -e "$SCRIPTDIR/product/common/$1" ]; then
cat "$SCRIPTDIR/product/common/$fname" cat "$SCRIPTDIR/product/common/$1"
fi fi
} }