mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge pull request #2612 from MilhouseVH/le82_proto-8.2.5
Various fixes and updates for a future libreelec-8.2
This commit is contained in:
Christian Hewitt
GitHub
commit
91718a8461
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="bcm2835-driver"
|
||||
PKG_VERSION="3347884"
|
||||
PKG_VERSION="36f9913"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="nonfree"
|
||||
PKG_SITE="http://www.broadcom.com"
|
||||
|
||||
@ -59,8 +59,8 @@ case "$LINUX" in
|
||||
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET imx6-status-led imx6-soc-fan irqbalanced"
|
||||
;;
|
||||
default-rpi)
|
||||
PKG_VERSION="4.9.59"
|
||||
PKG_URL="http://www.kernel.org/pub/linux/kernel/v4.x/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_VERSION="be97febf4aa42b1d019ad24e7948739da8557f66" #4.9.80
|
||||
PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz"
|
||||
PKG_PATCH_DIRS="default-rpi"
|
||||
;;
|
||||
*)
|
||||
|
||||
@ -0,0 +1,24 @@
|
||||
From abfbd6e4fc3cd4ff256207312605c69ad23ed215 Mon Sep 17 00:00:00 2001
|
||||
From: MilhouseVH <milhouseVH.github@nmacleod.com>
|
||||
Date: Sun, 29 Oct 2017 15:31:10 +0000
|
||||
Subject: [PATCH] lan78xx: Disable WOL
|
||||
|
||||
---
|
||||
drivers/net/usb/lan78xx.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
|
||||
index f33460c..ff4ad6c 100644
|
||||
--- a/drivers/net/usb/lan78xx.c
|
||||
+++ b/drivers/net/usb/lan78xx.c
|
||||
@@ -1618,7 +1618,7 @@ static const struct ethtool_ops lan78xx_ethtool_ops = {
|
||||
.get_sset_count = lan78xx_get_sset_count,
|
||||
.get_strings = lan78xx_get_strings,
|
||||
.get_wol = lan78xx_get_wol,
|
||||
- .set_wol = lan78xx_set_wol,
|
||||
+// .set_wol = lan78xx_set_wol,
|
||||
.get_eee = lan78xx_get_eee,
|
||||
.set_eee = lan78xx_set_eee,
|
||||
.get_pauseparam = lan78xx_get_pause,
|
||||
--
|
||||
2.7.4
|
||||
@ -1,100 +0,0 @@
|
||||
From abfbd6e4fc3cd4ff256207312605c69ad23ed215 Mon Sep 17 00:00:00 2001
|
||||
From: MilhouseVH <milhouseVH.github@nmacleod.com>
|
||||
Date: Sun, 29 Oct 2017 15:31:10 +0000
|
||||
Subject: [PATCH 1/3] lan78xx: Disable WOL
|
||||
|
||||
---
|
||||
drivers/net/usb/lan78xx.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
|
||||
index f33460c..ff4ad6c 100644
|
||||
--- a/drivers/net/usb/lan78xx.c
|
||||
+++ b/drivers/net/usb/lan78xx.c
|
||||
@@ -1618,7 +1618,7 @@ static const struct ethtool_ops lan78xx_ethtool_ops = {
|
||||
.get_sset_count = lan78xx_get_sset_count,
|
||||
.get_strings = lan78xx_get_strings,
|
||||
.get_wol = lan78xx_get_wol,
|
||||
- .set_wol = lan78xx_set_wol,
|
||||
+// .set_wol = lan78xx_set_wol,
|
||||
.get_eee = lan78xx_get_eee,
|
||||
.set_eee = lan78xx_set_eee,
|
||||
.get_pauseparam = lan78xx_get_pause,
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
||||
From 31a1f69f2fe9f158a27bdf7d6a516a84c6a054a9 Mon Sep 17 00:00:00 2001
|
||||
From: Phil Elwell <phil@raspberrypi.org>
|
||||
Date: Tue, 17 Oct 2017 15:04:29 +0100
|
||||
Subject: [PATCH 2/3] lan78xx: Enable LED0 and LED1
|
||||
|
||||
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
||||
---
|
||||
drivers/net/usb/lan78xx.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
|
||||
index ff4ad6c..65c86c2 100644
|
||||
--- a/drivers/net/usb/lan78xx.c
|
||||
+++ b/drivers/net/usb/lan78xx.c
|
||||
@@ -2204,6 +2204,7 @@ static int lan78xx_reset(struct lan78xx_net *dev)
|
||||
|
||||
ret = lan78xx_read_reg(dev, HW_CFG, &buf);
|
||||
buf |= HW_CFG_MEF_;
|
||||
+ buf |= HW_CFG_LED0_EN_ | HW_CFG_LED1_EN_;
|
||||
ret = lan78xx_write_reg(dev, HW_CFG, buf);
|
||||
|
||||
ret = lan78xx_read_reg(dev, USB_CFG0, &buf);
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
||||
From 2c5e254d9cff51d8e01cb3fe4cf35d87823e1f0d Mon Sep 17 00:00:00 2001
|
||||
From: Phil Elwell <phil@raspberrypi.org>
|
||||
Date: Fri, 21 Jul 2017 11:30:18 +0100
|
||||
Subject: [PATCH 3/3] lan78xx: Read MAC address from DT if present
|
||||
|
||||
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
||||
---
|
||||
drivers/net/usb/lan78xx.c | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
|
||||
index 65c86c2..0113ac4 100644
|
||||
--- a/drivers/net/usb/lan78xx.c
|
||||
+++ b/drivers/net/usb/lan78xx.c
|
||||
@@ -31,6 +31,7 @@
|
||||
#include <linux/mdio.h>
|
||||
#include <net/ip6_checksum.h>
|
||||
#include <linux/microchipphy.h>
|
||||
+#include <linux/of_net.h>
|
||||
#include "lan78xx.h"
|
||||
|
||||
#define DRIVER_AUTHOR "WOOJUNG HUH <woojung.huh@microchip.com>"
|
||||
@@ -1638,6 +1639,14 @@ static void lan78xx_init_mac_address(struct lan78xx_net *dev)
|
||||
u32 addr_lo, addr_hi;
|
||||
int ret;
|
||||
u8 addr[6];
|
||||
+ const u8 *mac_addr;
|
||||
+
|
||||
+ /* maybe the boot loader passed the MAC address in devicetree */
|
||||
+ mac_addr = of_get_mac_address(dev->udev->dev.of_node);
|
||||
+ if (mac_addr) {
|
||||
+ ether_addr_copy(addr, mac_addr);
|
||||
+ goto set_mac_addr;
|
||||
+ }
|
||||
|
||||
ret = lan78xx_read_reg(dev, RX_ADDRL, &addr_lo);
|
||||
ret = lan78xx_read_reg(dev, RX_ADDRH, &addr_hi);
|
||||
@@ -1666,6 +1675,7 @@ static void lan78xx_init_mac_address(struct lan78xx_net *dev)
|
||||
"MAC address set to random addr");
|
||||
}
|
||||
|
||||
+set_mac_addr:
|
||||
addr_lo = addr[0] | (addr[1] << 8) |
|
||||
(addr[2] << 16) | (addr[3] << 24);
|
||||
addr_hi = addr[4] | (addr[5] << 8);
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="bcm2835-bootloader"
|
||||
PKG_VERSION="3347884"
|
||||
PKG_VERSION="36f9913"
|
||||
PKG_ARCH="arm"
|
||||
PKG_LICENSE="nonfree"
|
||||
PKG_SITE="http://www.broadcom.com"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xf86-video-nvidia-legacy"
|
||||
PKG_VERSION="340.104"
|
||||
PKG_VERSION="340.106"
|
||||
PKG_ARCH="x86_64"
|
||||
PKG_LICENSE="nonfree"
|
||||
PKG_SITE="http://www.nvidia.com/"
|
||||
|
||||
@ -20,7 +20,7 @@ PKG_NAME="xf86-video-nvidia"
|
||||
# Remember to run "python packages/x11/driver/xf86-video-nvidia/scripts/make_nvidia_udev.py" and commit changes to
|
||||
# "packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules" whenever bumping version.
|
||||
# Host may require installation of python-lxml and python-requests packages.
|
||||
PKG_VERSION="384.90"
|
||||
PKG_VERSION="390.42"
|
||||
PKG_ARCH="x86_64"
|
||||
PKG_LICENSE="nonfree"
|
||||
PKG_SITE="http://www.nvidia.com/"
|
||||
|
||||
@ -311,6 +311,8 @@ ATTRS{device}=="0x1618", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1619", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x161a", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1667", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x174d", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x174e", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x179c", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x17c2", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x17c8", GOTO="configure_nvidia"
|
||||
@ -324,6 +326,7 @@ ATTRS{device}=="0x1b30", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1b38", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1b80", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1b81", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1b82", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1b84", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1b87", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1ba0", GOTO="configure_nvidia"
|
||||
@ -336,11 +339,15 @@ ATTRS{device}=="0x1bb5", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1bb6", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1bb7", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1bb8", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1bc7", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1be0", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1be1", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1c02", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1c03", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1c04", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1c06", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1c07", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1c09", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1c20", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1c21", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1c22", GOTO="configure_nvidia"
|
||||
@ -355,9 +362,14 @@ ATTRS{device}=="0x1c8d", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1cb1", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1cb2", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1cb3", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1cb6", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1d01", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1d10", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1d12", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1d33", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1d81", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1db1", GOTO="configure_nvidia"
|
||||
ATTRS{device}=="0x1db4", GOTO="configure_nvidia"
|
||||
GOTO="configure_nvidia-legacy"
|
||||
|
||||
LABEL="configure_nvidia"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 4.9.59 Kernel Configuration
|
||||
# Linux/arm 4.9.80 Kernel Configuration
|
||||
#
|
||||
CONFIG_ARM=y
|
||||
CONFIG_ARM_HAS_SG_CHAIN=y
|
||||
@ -848,6 +848,7 @@ CONFIG_BRIDGE=m
|
||||
CONFIG_BRIDGE_IGMP_SNOOPING=y
|
||||
# CONFIG_BRIDGE_VLAN_FILTERING is not set
|
||||
CONFIG_HAVE_NET_DSA=y
|
||||
# CONFIG_NET_DSA is not set
|
||||
CONFIG_VLAN_8021Q=m
|
||||
# CONFIG_VLAN_8021Q_GVRP is not set
|
||||
# CONFIG_VLAN_8021Q_MVRP is not set
|
||||
@ -1488,6 +1489,7 @@ CONFIG_TOUCHSCREEN_ADS7846=m
|
||||
# CONFIG_TOUCHSCREEN_EETI is not set
|
||||
CONFIG_TOUCHSCREEN_EGALAX=m
|
||||
# CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set
|
||||
# CONFIG_TOUCHSCREEN_EXC3000 is not set
|
||||
# CONFIG_TOUCHSCREEN_FUJITSU is not set
|
||||
# CONFIG_TOUCHSCREEN_GOODIX is not set
|
||||
# CONFIG_TOUCHSCREEN_ILI210X is not set
|
||||
@ -3594,6 +3596,7 @@ CONFIG_RESET_CONTROLLER=y
|
||||
#
|
||||
# Performance monitor support
|
||||
#
|
||||
# CONFIG_RPI_AXIPERF is not set
|
||||
# CONFIG_RAS is not set
|
||||
|
||||
#
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 4.9.59 Kernel Configuration
|
||||
# Linux/arm 4.9.80 Kernel Configuration
|
||||
#
|
||||
CONFIG_ARM=y
|
||||
CONFIG_ARM_HAS_SG_CHAIN=y
|
||||
@ -932,6 +932,7 @@ CONFIG_BRIDGE=m
|
||||
CONFIG_BRIDGE_IGMP_SNOOPING=y
|
||||
# CONFIG_BRIDGE_VLAN_FILTERING is not set
|
||||
CONFIG_HAVE_NET_DSA=y
|
||||
# CONFIG_NET_DSA is not set
|
||||
CONFIG_VLAN_8021Q=m
|
||||
# CONFIG_VLAN_8021Q_GVRP is not set
|
||||
# CONFIG_VLAN_8021Q_MVRP is not set
|
||||
@ -1576,6 +1577,7 @@ CONFIG_TOUCHSCREEN_ADS7846=m
|
||||
# CONFIG_TOUCHSCREEN_EETI is not set
|
||||
CONFIG_TOUCHSCREEN_EGALAX=m
|
||||
# CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set
|
||||
# CONFIG_TOUCHSCREEN_EXC3000 is not set
|
||||
# CONFIG_TOUCHSCREEN_FUJITSU is not set
|
||||
# CONFIG_TOUCHSCREEN_GOODIX is not set
|
||||
# CONFIG_TOUCHSCREEN_ILI210X is not set
|
||||
@ -3690,6 +3692,7 @@ CONFIG_RESET_CONTROLLER=y
|
||||
#
|
||||
# Performance monitor support
|
||||
#
|
||||
# CONFIG_RPI_AXIPERF is not set
|
||||
# CONFIG_RAS is not set
|
||||
|
||||
#
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,123 +0,0 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
BIN=$(readlink -f $(dirname $0))
|
||||
|
||||
if git rev-parse --is-inside-work-tree &>/dev/null; then
|
||||
echo "Don't run this script inside a git reppository!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
DEPTH=1000
|
||||
BRANCH="$1"
|
||||
|
||||
while [ $# -gt 1 ]; do
|
||||
if [ "${2,,}" == "rebase" ]; then
|
||||
REBASE="_rebase"
|
||||
elif [[ ${2,,} =~ [_-]rebase ]]; then
|
||||
REBASE="$2"
|
||||
elif [[ ${2} =~ ^[0-9a-f]*$ ]]; then
|
||||
BASEREV="${2}"
|
||||
fi
|
||||
shift
|
||||
done
|
||||
|
||||
usage()
|
||||
{
|
||||
local me="$(basename $0)"
|
||||
|
||||
echo "Usage: ${me} <major.minor>|<major.minor.patch> [[_-]rebase] [baserev]"
|
||||
echo
|
||||
echo "Example: 4.4 (for rpi-4.4.y) or 4.4.6 - specifying an exact kernel version avoids fetching the upstream repo"
|
||||
echo " 4.4 rebase - use rpi-4.4.y_rebase branch"
|
||||
echo " 4.4 -rebase - use rpi-4.4.y-rebase branch"
|
||||
echo " 4.6-rc6"
|
||||
echo " 4.7 523d939ef98fd712632d93a5a2b588e477a7565e"
|
||||
echo " 4.7.0"
|
||||
exit 1
|
||||
}
|
||||
|
||||
if [ -z "${BRANCH}" ]; then
|
||||
echo "ERROR: Branch must be specified!"
|
||||
echo
|
||||
usage
|
||||
fi
|
||||
|
||||
if [[ ${BRANCH} =~ [0-9]*\.[0-9]*\.[0-9]* ]]; then
|
||||
KERNEL="${BRANCH}"
|
||||
BRANCH="${BRANCH%.*}"
|
||||
elif [[ ${BRANCH} =~ [0-9]*\.[0-9]*-rc[0-9] ]]; then
|
||||
KERNEL="${BRANCH}"
|
||||
BRANCH="${BRANCH%-*}"
|
||||
fi
|
||||
|
||||
# On initial release, eg. 4.7.0, the kernel will actually be known as 4.7 in git so strip the trailing .0
|
||||
[[ ${KERNEL} =~ ^[0-9]*\.[0-9]*\.0*$ ]] && KERNEL="${KERNEL%.*}"
|
||||
|
||||
rm -fr raspberrypi-linux
|
||||
|
||||
# If we have a persisted version of the repo, quickly copy it
|
||||
if [ -d raspberrypi-linux.stash ]; then
|
||||
echo "Copying raspberrypi-linux.stash to raspberrypi-linux..."
|
||||
cp -r raspberrypi-linux.stash raspberrypi-linux
|
||||
cd raspberrypi-linux
|
||||
git checkout rpi-${BRANCH}.y${REBASE}
|
||||
else
|
||||
git clone -b rpi-${BRANCH}.y${REBASE} --depth=${DEPTH} --single-branch https://github.com/raspberrypi/linux.git raspberrypi-linux
|
||||
cd raspberrypi-linux
|
||||
fi
|
||||
|
||||
if [ -z "${KERNEL}" -a -z "${BASEREV}" ]; then
|
||||
git remote add -t linux-${BRANCH}.y linux-stable https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
|
||||
fi
|
||||
|
||||
# Apply the following config change to reduce chance of duplicate hashes
|
||||
git config --local core.abbrev 40
|
||||
|
||||
git fetch --all --depth=${DEPTH}
|
||||
git reset --hard origin/rpi-${BRANCH}.y${REBASE}
|
||||
|
||||
if [ -n "${BASEREV}" ]; then
|
||||
:
|
||||
elif [ -z "${KERNEL}" ]; then
|
||||
BASEREV="linux-stable/linux-${BRANCH}.y"
|
||||
else
|
||||
BASEREV="$(git log --grep "Linux ${KERNEL}" --pretty=oneline | head -1)"
|
||||
[ -z "${BASEREV}" ] && { echo "Unable to determine base revision for BRANCH=${BRANCH}, KERNEL=${KERNEL}"; exit 1; }
|
||||
|
||||
echo
|
||||
echo "FOUND BASE REV: ${BASEREV}"
|
||||
echo
|
||||
|
||||
BASEREV="${BASEREV%% *}"
|
||||
fi
|
||||
|
||||
GIT_SEQUENCE_EDITOR=${BIN}/rpi-linux-rebase.sh git rebase -i ${BASEREV}
|
||||
git format-patch --no-signature --stdout ${BASEREV} > /tmp/linux-01-RPi_support.patch
|
||||
|
||||
cd .. && rm -fr raspberrypi-linux
|
||||
|
||||
echo
|
||||
cat /tmp/dropped
|
||||
|
||||
echo
|
||||
echo "Dropped patches: /tmp/dropped"
|
||||
echo "New patch file : /tmp/linux-01-RPi_support.patch"
|
||||
|
||||
echo
|
||||
echo "## LibreELEC Update Notes ##"
|
||||
echo
|
||||
echo "cd LibreELEC.tv"
|
||||
echo "git checkout master"
|
||||
echo "git pull upstream master"
|
||||
echo "git checkout -b somebranch"
|
||||
|
||||
echo
|
||||
echo "cp /tmp/linux-01-RPi_support.patch projects/RPi/patches/linux/linux-01-RPi_support.patch"
|
||||
echo
|
||||
echo "cp /tmp/linux-01-RPi_support.patch projects/RPi2/patches/linux/linux-01-RPi_support.patch"
|
||||
|
||||
echo
|
||||
echo "git commit -am \"RPi/RPi2: update linux support patches for linux ${KERNEL:-${BRANCH}}\""
|
||||
|
||||
echo
|
||||
@ -1,29 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Setup:
|
||||
# git clone -b rpi-4.4.y --depth=1000 --single-branch git@github.com:raspberrypi/linux.git raspberrypi-linux
|
||||
# git remote add -t linux-4.4.y linux-stable git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
|
||||
# git config --local core.abbrev 40
|
||||
# Update:
|
||||
# git fetch --all --depth=1000
|
||||
# git reset --hard origin/rpi-4.4.y
|
||||
# GIT_SEQUENCE_EDITOR=../rpi-linux-rebase.sh git rebase -i linux-stable/linux-4.4.y
|
||||
# git format-patch --no-signature --stdout linux-stable/linux-4.4.y > ../linux-01-RPi_support.patch
|
||||
|
||||
TODO=$1
|
||||
|
||||
# Drop commits not used
|
||||
DROP_COMMITS="
|
||||
Added Device IDs for August DVB-T 205
|
||||
net\: Add non-mainline source for rtl8192cu wlan
|
||||
net\: Fix rtl8192cu build errors on other platforms
|
||||
ARM64\: Fix build break for RTL8187\/RTL8192CU wifi
|
||||
"
|
||||
|
||||
IFS=$'\n'
|
||||
for COMMIT in $DROP_COMMITS; do
|
||||
sed -i -E "s/^pick ([0-9a-f]+) (${COMMIT}.*)/drop \1 \2/g" $TODO
|
||||
done
|
||||
|
||||
grep -E "^drop " $TODO > /tmp/dropped
|
||||
sed -i -E "/^drop /d" $TODO
|
||||
Loading…
x
Reference in New Issue
Block a user