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

Merge pull request #2964 from MilhouseVH/le90_fix_install_proj_dev

Browse Source 
buildsystem: better support for project and device config files
This commit is contained in:
CvH 2018-09-10 15:04:01 +02:00 committed by GitHub
commit 7193cc0feb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 55 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/options
View File

@ -64,8 +64,8 @@ PROJECT_DIR="$ROOT/projects"
# projects can set KERNEL_NAME (kernel.img) # projects can set KERNEL_NAME (kernel.img)
[ -z "$KERNEL_NAME" ] && KERNEL_NAME="KERNEL" [ -z "$KERNEL_NAME" ] && KERNEL_NAME="KERNEL"
LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux $PROJECT_DIR/$PROJECT/patches/linux $ROOT/packages/linux" LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux $PROJECT_DIR/$PROJECT/patches/linux $PROJECT_DIR/$PROJECT/packages/linux $ROOT/packages/linux"
[ -n "$DEVICE" ] && LINUX_DEPENDS+=" $PROJECT_DIR/$PROJECT/devices/$DEVICE/linux $PROJECT_DIR/$PROJECT/devices/$DEVICE/patches/linux" [ -n "$DEVICE" ] && LINUX_DEPENDS+=" $PROJECT_DIR/$PROJECT/devices/$DEVICE/linux $PROJECT_DIR/$PROJECT/devices/$DEVICE/patches/linux $PROJECT_DIR/$PROJECT/devices/$DEVICE/packages/linux"
[ "$TARGET_ARCH" = "x86_64" ] && LINUX_DEPENDS+=" $ROOT/packages/linux-firmware/intel-ucode $ROOT/packages/linux-firmware/kernel-firmware" [ "$TARGET_ARCH" = "x86_64" ] && LINUX_DEPENDS+=" $ROOT/packages/linux-firmware/intel-ucode $ROOT/packages/linux-firmware/kernel-firmware"
# Need to point to your actual cc # Need to point to your actual cc

97
scripts/install
View File

@ -3,6 +3,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later # SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2010-2011 Roman Weber (roman@openelec.tv) # Copyright (C) 2010-2011 Roman Weber (roman@openelec.tv)
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
. config/options $1 . config/options $1
@ -60,60 +61,68 @@ fi
mkdir -p $INSTALL mkdir -p $INSTALL
if [ "$TARGET" = target ] ; then if [ "$TARGET" = target ] ; then
if [ -d $PKG_DIR/profile.d ]; then for PKG_TMP_DIR in $PKG_DIR \
mkdir -p $INSTALL/etc/profile.d $PROJECT_DIR/$PROJECT/packages/$PKG_NAME \
cp $PKG_DIR/profile.d/*.conf $INSTALL/etc/profile.d/ $PROJECT_DIR/$PROJECT/devices/$DEVICE/packages/$PKG_NAME \
fi ; do
if [ -d $PKG_DIR/tmpfiles.d ]; then [ -d $PKG_TMP_DIR ] || continue
mkdir -p $INSTALL/usr/lib/tmpfiles.d
cp $PKG_DIR/tmpfiles.d/*.conf $INSTALL/usr/lib/tmpfiles.d
fi
if [ -d $PKG_DIR/system.d ]; then if [ -d $PKG_TMP_DIR/profile.d ]; then
mkdir -p $INSTALL/usr/lib/systemd/system mkdir -p $INSTALL/etc/profile.d
cp $PKG_DIR/system.d/*.* $INSTALL/usr/lib/systemd/system cp $PKG_TMP_DIR/profile.d/*.conf $INSTALL/etc/profile.d
fi fi
if [ -d $PKG_DIR/udev.d ]; then if [ -d $PKG_TMP_DIR/tmpfiles.d ]; then
mkdir -p $INSTALL/usr/lib/udev/rules.d mkdir -p $INSTALL/usr/lib/tmpfiles.d
cp $PKG_DIR/udev.d/*.rules $INSTALL/usr/lib/udev/rules.d cp $PKG_TMP_DIR/tmpfiles.d/*.conf $INSTALL/usr/lib/tmpfiles.d
fi fi
if [ -d $PKG_DIR/sleep.d ]; then if [ -d $PKG_TMP_DIR/system.d ]; then
mkdir -p $INSTALL/usr/lib/systemd/system-sleep/ mkdir -p $INSTALL/usr/lib/systemd/system
cp $PKG_DIR/sleep.d/* $INSTALL/usr/lib/systemd/system-sleep/ cp $PKG_TMP_DIR/system.d/*.* $INSTALL/usr/lib/systemd/system
fi fi
if [ -d $PKG_DIR/sleep.d.serial ]; then if [ -d $PKG_TMP_DIR/udev.d ]; then
mkdir -p $INSTALL/usr/lib/systemd/system-sleep.serial mkdir -p $INSTALL/usr/lib/udev/rules.d
cp $PKG_DIR/sleep.d.serial/* $INSTALL/usr/lib/systemd/system-sleep.serial cp $PKG_TMP_DIR/udev.d/*.rules $INSTALL/usr/lib/udev/rules.d
fi fi
if [ -d $PKG_DIR/sysctl.d ]; then if [ -d $PKG_TMP_DIR/sleep.d ]; then
mkdir -p $INSTALL/usr/lib/sysctl.d/ mkdir -p $INSTALL/usr/lib/systemd/system-sleep
cp $PKG_DIR/sysctl.d/*.conf $INSTALL/usr/lib/sysctl.d/ cp $PKG_TMP_DIR/sleep.d/* $INSTALL/usr/lib/systemd/system-sleep
fi fi
if [ -d $PKG_DIR/modules-load.d ]; then if [ -d $PKG_TMP_DIR/sleep.d.serial ]; then
mkdir -p $INSTALL/usr/lib/modules-load.d/ mkdir -p $INSTALL/usr/lib/systemd/system-sleep.serial
cp $PKG_DIR/modules-load.d/*.conf $INSTALL/usr/lib/modules-load.d/ cp $PKG_TMP_DIR/sleep.d.serial/* $INSTALL/usr/lib/systemd/system-sleep.serial
fi fi
if [ -d $PKG_DIR/sysconf.d ]; then if [ -d $PKG_TMP_DIR/sysctl.d ]; then
mkdir -p $INSTALL/etc/sysconf.d mkdir -p $INSTALL/usr/lib/sysctl.d
cp $PKG_DIR/sysconf.d/*.conf $INSTALL/etc/sysconf.d cp $PKG_TMP_DIR/sysctl.d/*.conf $INSTALL/usr/lib/sysctl.d
fi fi
if [ -d $PKG_DIR/debug.d ]; then if [ -d $PKG_TMP_DIR/modules-load.d ]; then
mkdir -p $INSTALL/usr/share/debugconf mkdir -p $INSTALL/usr/lib/modules-load.d
cp $PKG_DIR/debug.d/*.conf $INSTALL/usr/share/debugconf cp $PKG_TMP_DIR/modules-load.d/*.conf $INSTALL/usr/lib/modules-load.d
fi fi
if [ -d $PKG_DIR/modprobe.d ]; then if [ -d $PKG_TMP_DIR/sysconf.d ]; then
mkdir -p $INSTALL/usr/lib/modprobe.d mkdir -p $INSTALL/etc/sysconf.d
cp $PKG_DIR/modprobe.d/*.conf $INSTALL/usr/lib/modprobe.d cp $PKG_TMP_DIR/sysconf.d/*.conf $INSTALL/etc/sysconf.d
fi fi
if [ -d $PKG_TMP_DIR/debug.d ]; then
mkdir -p $INSTALL/usr/share/debugconf
cp $PKG_TMP_DIR/debug.d/*.conf $INSTALL/usr/share/debugconf
fi
if [ -d $PKG_TMP_DIR/modprobe.d ]; then
mkdir -p $INSTALL/usr/lib/modprobe.d
cp $PKG_TMP_DIR/modprobe.d/*.conf $INSTALL/usr/lib/modprobe.d
fi
done
fi fi
# unset functions # unset functions