mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 05:06:43 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-6.0
This commit is contained in:
commit
138a9aa4f0
@ -17,7 +17,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="bcm2835-driver"
|
PKG_NAME="bcm2835-driver"
|
||||||
PKG_VERSION="53b9bb9"
|
PKG_VERSION="e1e2823"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="nonfree"
|
PKG_LICENSE="nonfree"
|
||||||
|
@ -63,6 +63,9 @@ post_makeinstall_target() {
|
|||||||
rm -rf $INSTALL/usr/bin/ssh-add
|
rm -rf $INSTALL/usr/bin/ssh-add
|
||||||
rm -rf $INSTALL/usr/bin/ssh-agent
|
rm -rf $INSTALL/usr/bin/ssh-agent
|
||||||
rm -rf $INSTALL/usr/bin/ssh-keyscan
|
rm -rf $INSTALL/usr/bin/ssh-keyscan
|
||||||
|
|
||||||
|
sed -i $INSTALL/etc/ssh/sshd_config -e "s|^#PermitRootLogin.*|PermitRootLogin yes|g"
|
||||||
|
echo "PubkeyAcceptedKeyTypes +ssh-dss" >> $INSTALL/etc/ssh/sshd_config
|
||||||
}
|
}
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="bcm2835-bootloader"
|
PKG_NAME="bcm2835-bootloader"
|
||||||
PKG_VERSION="53b9bb9"
|
PKG_VERSION="e1e2823"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="arm"
|
PKG_ARCH="arm"
|
||||||
PKG_LICENSE="nonfree"
|
PKG_LICENSE="nonfree"
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,11 @@
|
|||||||
|
--- a/drivers/spi/spi-bcm2835.c 2015-08-18 01:31:02.424153151 +0100
|
||||||
|
+++ b/drivers/spi/spi-bcm2835.c 2015-08-18 01:30:50.860074902 +0100
|
||||||
|
@@ -592,7 +592,7 @@
|
||||||
|
return bcm2835_spi_transfer_one_irq(master, spi, tfr, cs);
|
||||||
|
}
|
||||||
|
|
||||||
|
-#if 0
|
||||||
|
+#if 1
|
||||||
|
static void bcm2835_spi_handle_err(struct spi_master *master,
|
||||||
|
struct spi_message *msg)
|
||||||
|
{
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,11 @@
|
|||||||
|
--- a/drivers/spi/spi-bcm2835.c 2015-08-18 01:31:02.424153151 +0100
|
||||||
|
+++ b/drivers/spi/spi-bcm2835.c 2015-08-18 01:30:50.860074902 +0100
|
||||||
|
@@ -592,7 +592,7 @@
|
||||||
|
return bcm2835_spi_transfer_one_irq(master, spi, tfr, cs);
|
||||||
|
}
|
||||||
|
|
||||||
|
-#if 0
|
||||||
|
+#if 1
|
||||||
|
static void bcm2835_spi_handle_err(struct spi_master *master,
|
||||||
|
struct spi_message *msg)
|
||||||
|
{
|
Loading…
x
Reference in New Issue
Block a user