jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2432 from MilhouseVH/le90_rm_if_then_boiler_plate

Browse Source 
buildsystem: avoid if/then/else boiler plate when accessing hierarchy [RFC]
This commit is contained in:
Christian Hewitt 2018-02-03 07:31:50 +04:00 committed by GitHub
commit 0d13de39e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 91 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
config/functions
View File

@ -228,7 +228,7 @@ get_pkg_directory() {
get_pkg_variable() {
if [ -n "$1" -a -n "$2" ] ; then
cd $ROOT
. config/options $1
. config/options $1 &>/dev/null
echo "${!2}"
fi
}
@ -246,6 +246,64 @@ target_has_feature() {
listcontains "$TARGET_FEATURES" "$1"
}
# find path for matching file or directory, searching standard directory hierarchy, using optional default
# if a path is located it will be set in FOUND_PATH and exit code will be 0.
find_path() {
local test_func="$1" search="$2" default="$3"
local dir match wildcard=0 ftype
# support wildcard matches
[[ $search =~ \* || $search =~ \? ]] && wildcard=1
[ "$test_func" = "-f" ] && ftype="file" || ftype="dir"
for dir in $PROJECT_DIR/$PROJECT/devices/$DEVICE/packages/$PKG_NAME \
$PROJECT_DIR/$PROJECT/devices/$DEVICE \
$PROJECT_DIR/$PROJECT/packages/$PKG_NAME \
$PROJECT_DIR/$PROJECT \
$DISTRO_DIR/$DISTRO/packages/$PKG_NAME \
$DISTRO_DIR/$DISTRO \
$PKG_DIR \
; do
# ignore directories with missing DEVICE or PKG_NAME components
[[ $dir =~ /packages/$ ]] && continue
[[ $dir =~ /devices/$ ]] && continue
[[ $dir =~ /devices//packages/$PKG_NAME$ ]] && continue
if [ $wildcard -eq 1 ]; then
ls $dir/$search 1>/dev/null 2>&1 && match="$dir/$search" && break
else
[ $test_func "$dir/$search" ] && match="$dir/$search" && break
fi
done
if [ -z "$match" -a -n "$default" ]; then
if [[ $default =~ \* || $default =~ \? ]]; then
ls $default 1>/dev/null 2>&1 && match="$default"
else
[ $test_func "$default" ] && match="$default"
fi
fi
if [ -n "$match" ]; then
FOUND_PATH="$match"
[ "${VERBOSE_FIND_PATH,,}" = "yes" ] && echo "find_path: Searching for $ftype: \"$search\", found: \"$FOUND_PATH\"" >&2
return 0
else
unset FOUND_PATH
[ "${VERBOSE_FIND_PATH,,}" = "yes" ] && echo "find_path: Searching for $ftype: \"$search\" - not found" >&2
return 1
fi
}
find_file_path() {
find_path -f "$1" "$2"
}
find_dir_path() {
find_path -d "$1" "$2"
}
install_binary_addon() {
local addon_id="$1" addon_so

14
packages/network/samba/package.mk
View File

@ -143,17 +143,11 @@ post_makeinstall_target() {
mkdir -p $INSTALL/usr/lib/samba
cp $PKG_DIR/scripts/samba-config $INSTALL/usr/lib/samba
mkdir -p $INSTALL/etc/samba
if [ -n "$DEVICE" -a -f $PROJECT_DIR/$PROJECT/devices/$DEVICE/config/smb.conf ]; then
cp $PROJECT_DIR/$PROJECT/devices/$DEVICE/config/smb.conf $INSTALL/etc/samba
elif [ -f $PROJECT_DIR/$PROJECT/config/smb.conf ]; then
cp $PROJECT_DIR/$PROJECT/config/smb.conf $INSTALL/etc/samba
elif [ -f $DISTRO_DIR/$DISTRO/config/smb.conf ]; then
cp $DISTRO_DIR/$DISTRO/config/smb.conf $INSTALL/etc/samba
else
cp $PKG_DIR/config/smb.conf $INSTALL/etc/samba
if find_file_path config/smb.conf; then
mkdir -p $INSTALL/etc/samba
cp ${FOUND_PATH} $INSTALL/etc/samba
mkdir -p $INSTALL/usr/config
cp $PKG_DIR/config/smb.conf $INSTALL/usr/config/samba.conf.sample
cp $INSTALL/etc/samba/smb.conf $INSTALL/usr/config/samba.conf.sample
fi
if [ "$DEVTOOLS" = "yes" ]; then

26
packages/sysutils/busybox/package.mk
View File

@ -53,18 +53,6 @@ if [ "$NFS_SUPPORT" = yes ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET rpcbind"
fi
if [ -f $PROJECT_DIR/$PROJECT/busybox/busybox-target.conf ]; then
BUSYBOX_CFG_FILE_TARGET=$PROJECT_DIR/$PROJECT/busybox/busybox-target.conf
else
BUSYBOX_CFG_FILE_TARGET=$PKG_DIR/config/busybox-target.conf
fi
if [ -f $PROJECT_DIR/$PROJECT/busybox/busybox-init.conf ]; then
BUSYBOX_CFG_FILE_INIT=$PROJECT_DIR/$PROJECT/busybox/busybox-init.conf
else
BUSYBOX_CFG_FILE_INIT=$PKG_DIR/config/busybox-init.conf
fi
pre_build_target() {
mkdir -p $PKG_BUILD/.$TARGET_NAME
cp -RP $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME
@ -92,7 +80,8 @@ configure_host() {
configure_target() {
cd $PKG_BUILD/.$TARGET_NAME
cp $BUSYBOX_CFG_FILE_TARGET .config
find_file_path config/busybox-target.conf
cp $FOUND_PATH .config
# set install dir
sed -i -e "s|^CONFIG_PREFIX=.*$|CONFIG_PREFIX=\"$INSTALL/usr\"|" .config
@ -129,7 +118,8 @@ configure_target() {
configure_init() {
cd $PKG_BUILD/.$TARGET_NAME-init
cp $BUSYBOX_CFG_FILE_INIT .config
find_file_path config/busybox-init.conf
cp $FOUND_PATH .config
# set install dir
sed -i -e "s|^CONFIG_PREFIX=.*$|CONFIG_PREFIX=\"$INSTALL/usr\"|" .config
@ -234,12 +224,8 @@ makeinstall_init() {
touch $INSTALL/etc/fstab
ln -sf /proc/self/mounts $INSTALL/etc/mtab
if [ -n "$DEVICE" -a -f $PROJECT_DIR/$PROJECT/devices/$DEVICE/initramfs/platform_init ]; then
cp $PROJECT_DIR/$PROJECT/devices/$DEVICE/initramfs/platform_init $INSTALL
elif [ -f $PROJECT_DIR/$PROJECT/initramfs/platform_init ]; then
cp $PROJECT_DIR/$PROJECT/initramfs/platform_init $INSTALL
fi
if [ -f $INSTALL/platform_init ]; then
if find_file_path initramfs/platform_init; then
cp ${FOUND_PATH} $INSTALL
chmod 755 $INSTALL/platform_init
fi

25
packages/tools/bcm2835-bootloader/package.mk
View File

@ -36,29 +36,10 @@ makeinstall_target() {
cp -PRv fixup_x.dat $INSTALL/usr/share/bootloader/fixup.dat
cp -PRv start_x.elf $INSTALL/usr/share/bootloader/start.elf
if [ -f $PROJECT_DIR/$PROJECT/devices/$DEVICE/config/dt-blob.bin ]; then
cp -PRv $PROJECT_DIR/$PROJECT/devices/$DEVICE/config/dt-blob.bin $INSTALL/usr/share/bootloader
fi
find_file_path config/dt-blob.bin && cp -PRv $FOUND_PATH $INSTALL/usr/share/bootloader
cp -PRv $PKG_DIR/scripts/update.sh $INSTALL/usr/share/bootloader
if [ -f $PROJECT_DIR/$PROJECT/devices/$DEVICE/config/distroconfig.txt ]; then
cp -PRv $PROJECT_DIR/$PROJECT/devices/$DEVICE/config/distroconfig.txt $INSTALL/usr/share/bootloader
elif [ -f $PROJECT_DIR/$PROJECT/config/distroconfig.txt ]; then
cp -PRv $PROJECT_DIR/$PROJECT/config/distroconfig.txt $INSTALL/usr/share/bootloader
elif [ -f $DISTRO_DIR/$DISTRO/config/distroconfig.txt ]; then
cp -PRv $DISTRO_DIR/$DISTRO/config/distroconfig.txt $INSTALL/usr/share/bootloader
else
cp -PRv $PKG_DIR/files/3rdparty/bootloader/distroconfig.txt $INSTALL/usr/share/bootloader
fi
if [ -f $PROJECT_DIR/$PROJECT/devices/$DEVICE/config/config.txt ]; then
cp -PRv $PROJECT_DIR/$PROJECT/devices/$DEVICE/config/config.txt $INSTALL/usr/share/bootloader
elif [ -f $PROJECT_DIR/$PROJECT/config/config.txt ]; then
cp -PRv $PROJECT_DIR/$PROJECT/config/config.txt $INSTALL/usr/share/bootloader
elif [ -f $DISTRO_DIR/$DISTRO/config/config.txt ]; then
cp -PRv $DISTRO_DIR/$DISTRO/config/config.txt $INSTALL/usr/share/bootloader
else
cp -PRv $PKG_DIR/files/3rdparty/bootloader/config.txt $INSTALL/usr/share/bootloader
fi
find_file_path config/distroconfig.txt $PKG_DIR/files/3rdparty/bootloader/distroconfig.txt && cp -PRv ${FOUND_PATH} $INSTALL/usr/share/bootloader
find_file_path config/config.txt $PKG_DIR/files/3rdparty/bootloader/config.txt && cp -PRv ${FOUND_PATH} $INSTALL/usr/share/bootloader
}

7
packages/tools/installer/package.mk
View File

@ -35,11 +35,8 @@ post_install() {
-i $INSTALL/usr/bin/installer
mkdir -p $INSTALL/etc
if [ -f $PROJECT_DIR/$PROJECT/installer/installer.conf ]; then
cp $PROJECT_DIR/$PROJECT/installer/installer.conf $INSTALL/etc
else
cp $PKG_DIR/config/installer.conf $INSTALL/etc
fi
find_file_path config/installer.conf
cp ${FOUND_PATH} $INSTALL/etc
sed -e "s/@SYSTEM_SIZE@/$SYSTEM_SIZE/g" \
-e "s/@SYSTEM_PART_START@/$SYSTEM_PART_START/g" \
-e "s/@EXTLINUX_PARAMETERS@/$EXTLINUX_PARAMETERS/g" \

15
packages/tools/plymouth-lite/package.mk
View File

@ -43,17 +43,6 @@ makeinstall_init() {
cp ply-image $INSTALL/usr/bin
mkdir -p $INSTALL/splash
if [ -f $PROJECT_DIR/$PROJECT/splash/splash.conf ]; then
cp $PROJECT_DIR/$PROJECT/splash/splash.conf $INSTALL/splash
cp $PROJECT_DIR/$PROJECT/splash/*.png $INSTALL/splash
elif ls $PROJECT_DIR/$PROJECT/splash/splash-*.png 1>/dev/null 2>&1; then
cp $PROJECT_DIR/$PROJECT/splash/splash-*.png $INSTALL/splash
elif [ -f $DISTRO_DIR/$DISTRO/splash/splash.conf ]; then
cp $DISTRO_DIR/$DISTRO/splash/splash.conf $INSTALL/splash
cp $DISTRO_DIR/$DISTRO/splash/*.png $INSTALL/splash
elif ls $DISTRO_DIR/$DISTRO/splash/splash-*.png 1>/dev/null 2>&1; then
cp $DISTRO_DIR/$DISTRO/splash/splash-*.png $INSTALL/splash
else
cp $PKG_DIR/splash/splash-*.png $INSTALL/splash
fi
find_file_path splash/splash.conf && cp ${FOUND_PATH} $INSTALL/splash
find_file_path "splash/splash-*.png" && cp ${FOUND_PATH} $INSTALL/splash
}

20
packages/tools/u-boot/package.mk
View File

@ -55,27 +55,15 @@ makeinstall_target() {
# Only install u-boot.img et al when building a board specific image
if [ -n "$UBOOT_SYSTEM" ]; then
if [ -f $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader/install ]; then
. $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader/install
elif [ -f $PROJECT_DIR/$PROJECT/bootloader/install ]; then
. $PROJECT_DIR/$PROJECT/bootloader/install
fi
find_file_path bootloader/install && . ${FOUND_PATH}
fi
# Always install the update script
if [ -f $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader/update.sh ]; then
cp -av $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader/update.sh $INSTALL/usr/share/bootloader
elif [ -f $PROJECT_DIR/$PROJECT/bootloader/update.sh ]; then
cp -av $PROJECT_DIR/$PROJECT/bootloader/update.sh $INSTALL/usr/share/bootloader
fi
find_file_path bootloader/update.sh && cp -av ${FOUND_PATH} $INSTALL/usr/share/bootloader
# Always install the canupdate script
if [ -f $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader/canupdate.sh ]; then
cp -av $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader/canupdate.sh $INSTALL/usr/share/bootloader
elif [ -f $PROJECT_DIR/$PROJECT/bootloader/canupdate.sh ]; then
cp -av $PROJECT_DIR/$PROJECT/bootloader/canupdate.sh $INSTALL/usr/share/bootloader
fi
if [ -f $INSTALL/usr/share/bootloader/canupdate.sh ]; then
if find_file_path bootloader/canupdate.sh; then
cp -av ${FOUND_PATH} $INSTALL/usr/share/bootloader
sed -e "s/@PROJECT@/${DEVICE:-$PROJECT}/g" \
-i $INSTALL/usr/share/bootloader/canupdate.sh
fi

7
packages/x11/xserver/xorg-server/package.mk
View File

@ -156,11 +156,8 @@ post_makeinstall_target() {
fi
mkdir -p $INSTALL/etc/X11
if [ -f $PROJECT_DIR/$PROJECT/xorg/xorg.conf ]; then
cp $PROJECT_DIR/$PROJECT/xorg/xorg.conf $INSTALL/etc/X11
elif [ -f $PKG_DIR/config/xorg.conf ]; then
cp $PKG_DIR/config/xorg.conf $INSTALL/etc/X11
fi
find_file_path config/xorg.conf &&
cp $FOUND_PATH $INSTALL/etc/X11
if [ ! "$DEVTOOLS" = yes ]; then
rm -rf $INSTALL/usr/bin/cvt

21
projects/Amlogic/devices/LePotato/packages/u-boot/package.mk
View File

@ -48,26 +48,13 @@ makeinstall_target() {
mkdir -p $INSTALL/usr/share/bootloader
# Only install u-boot.img et al when building a board specific image
if [ -f $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader/install ]; then
. $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader/install
elif [ -f $PROJECT_DIR/$PROJECT/bootloader/install ]; then
. $PROJECT_DIR/$PROJECT/bootloader/install
fi
find_file_path bootloader/install && . ${FOUND_PATH}
# Always install the update script
if [ -f $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader/update.sh ]; then
cp -av $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader/update.sh $INSTALL/usr/share/bootloader
elif [ -f $PROJECT_DIR/$PROJECT/bootloader/update.sh ]; then
cp -av $PROJECT_DIR/$PROJECT/bootloader/update.sh $INSTALL/usr/share/bootloader
fi
find_file_path bootloader/update.sh && cp -av ${FOUND_PATH} $INSTALL/usr/share/bootloader
cp $PKG_BUILD/fip/u-boot.bin.sd.bin $INSTALL/usr/share/bootloader/u-boot
if [ -f $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader/boot.ini ]; then
cp -av $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader/boot.ini $INSTALL/usr/share/bootloader
fi
if [ -f $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader/config.ini ]; then
cp -av $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader/config.ini $INSTALL/usr/share/bootloader
fi
find_file_path bootloader/boot.ini && cp -av ${FOUND_PATH} $INSTALL/usr/share/bootloader
find_file_path bootloader/config.ini && cp -av ${FOUND_PATH} $INSTALL/usr/share/bootloader
}

12
scripts/image
View File

@ -283,15 +283,9 @@ if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]
cp -R $BOOTLOADER_DIR/files/* $RELEASE_DIR
fi
if [ -f $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader/release ]; then
echo "Running $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader/release"
. $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader/release
elif [ -f $PROJECT_DIR/$PROJECT/bootloader/release ]; then
echo "Running $PROJECT_DIR/$PROJECT/bootloader/release"
. $PROJECT_DIR/$PROJECT/bootloader/release
elif [ -f $BOOTLOADER_DIR/release ]; then
echo "Running $BOOTLOADER_DIR/release"
. $BOOTLOADER_DIR/release
if find_file_path bootloader/release $BOOTLOADER_DIR/release; then
echo "Running $FOUND_PATH"
. $FOUND_PATH
fi
fi

6
scripts/mkimage
View File

@ -249,10 +249,8 @@ EOF
mcopy -s "$LE_TMP"/extlinux ::
fi
if [ -f $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader/mkimage ]; then
. $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader/mkimage
elif [ -f $PROJECT_DIR/$PROJECT/bootloader/mkimage ]; then
. $PROJECT_DIR/$PROJECT/bootloader/mkimage
if find_file_path bootloader/mkimage; then
. ${FOUND_PATH}
else
echo "No specific mkimage script found. u-boot will not be written"
fi