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

linux: use unified /usr

Browse Source
This commit is contained in:
Lukas Rusak 2016-12-04 13:23:44 -08:00
parent 36229de2ae
commit 169d9e2bd4
No known key found for this signature in database
GPG Key ID: 8C310C807E7393A3
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/linux/package.mk
View File

@ -170,9 +170,9 @@ pre_make_target() {
make_target() { make_target() {
LDFLAGS="" make modules LDFLAGS="" make modules
LDFLAGS="" make INSTALL_MOD_PATH=$INSTALL DEPMOD="$ROOT/$TOOLCHAIN/bin/depmod" modules_install LDFLAGS="" make INSTALL_MOD_PATH=$INSTALL/usr DEPMOD="$ROOT/$TOOLCHAIN/bin/depmod" modules_install
rm -f $INSTALL/lib/modules/*/build rm -f $INSTALL/usr/lib/modules/*/build
rm -f $INSTALL/lib/modules/*/source rm -f $INSTALL/usr/lib/modules/*/source
( cd $ROOT ( cd $ROOT
rm -rf $ROOT/$BUILD/initramfs rm -rf $ROOT/$BUILD/initramfs
@ -220,28 +220,28 @@ make_init() {
makeinstall_init() { makeinstall_init() {
if [ -n "$INITRAMFS_MODULES" ]; then if [ -n "$INITRAMFS_MODULES" ]; then
mkdir -p $INSTALL/etc mkdir -p $INSTALL/etc
mkdir -p $INSTALL/lib/modules mkdir -p $INSTALL/usr/lib/modules
for i in $INITRAMFS_MODULES; do for i in $INITRAMFS_MODULES; do
module=`find .install_pkg/lib/modules/$(get_module_dir)/kernel -name $i.ko` module=`find .install_pkg/usr/lib/modules/$(get_module_dir)/kernel -name $i.ko`
if [ -n "$module" ]; then if [ -n "$module" ]; then
echo $i >> $INSTALL/etc/modules echo $i >> $INSTALL/etc/modules
cp $module $INSTALL/lib/modules/`basename $module` cp $module $INSTALL/usr/lib/modules/`basename $module`
fi fi
done done
fi fi
if [ "$UVESAFB_SUPPORT" = yes ]; then if [ "$UVESAFB_SUPPORT" = yes ]; then
mkdir -p $INSTALL/lib/modules mkdir -p $INSTALL/usr/lib/modules
uvesafb=`find .install_pkg/lib/modules/$(get_module_dir)/kernel -name uvesafb.ko` uvesafb=`find .install_pkg/usr/lib/modules/$(get_module_dir)/kernel -name uvesafb.ko`
cp $uvesafb $INSTALL/lib/modules/`basename $uvesafb` cp $uvesafb $INSTALL/usr/lib/modules/`basename $uvesafb`
fi fi
} }
post_install() { post_install() {
mkdir -p $INSTALL/lib/firmware/ mkdir -p $INSTALL/usr/lib/firmware/
ln -sf /storage/.config/firmware/ $INSTALL/lib/firmware/updates ln -sf /storage/.config/firmware/ $INSTALL/usr/lib/firmware/updates
# bluez looks in /etc/firmware/ # bluez looks in /etc/firmware/
ln -sf /lib/firmware/ $INSTALL/etc/firmware ln -sf /usr/lib/firmware/ $INSTALL/etc/firmware
} }

2
packages/linux/udev.d/30-disable-wakeup.rules
View File

@ -18,6 +18,6 @@
ACTION!="add|change", GOTO="end" ACTION!="add|change", GOTO="end"
DRIVER=="ehci-pci|xhci_hcd", RUN+="/bin/sh -c 'echo disabled > /sys/$devpath/power/wakeup'" DRIVER=="ehci-pci|xhci_hcd", RUN+="/usr/bin/sh -c 'echo disabled > /sys/$devpath/power/wakeup'"
LABEL="end" LABEL="end"

2
packages/linux/udev.d/40-modeswitch.rules
View File

@ -21,6 +21,6 @@ KERNEL!="sr[0-9]*", GOTO="end_modeswitch"
SUBSYSTEM!="block", GOTO="end_modeswitch" SUBSYSTEM!="block", GOTO="end_modeswitch"
# Atheros Wireless / Netgear WNDA3200 # Atheros Wireless / Netgear WNDA3200
ATTRS{idVendor}=="0cf3", ATTRS{idProduct}=="20ff", RUN+="/bin/eject '/dev/%k'" ATTRS{idVendor}=="0cf3", ATTRS{idProduct}=="20ff", RUN+="/usr/bin/eject '/dev/%k'"
LABEL="end_modeswitch" LABEL="end_modeswitch"