tools: update linux script and dropped commits

This commit is contained in:
MilhouseVH 2016-07-30 19:40:55 +01:00
parent b8790e870e
commit df75d91469
2 changed files with 21 additions and 19 deletions

View File

@ -10,17 +10,27 @@ fi
DEPTH=1000
BRANCH="$1"
[ -n "${2}" ] && REBASE="_rebase"
while [ $# -gt 1 ]; do
if [ "${2,,}" == "rebase" ]; then
REBASE="_rebase"
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]"
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.6-rc6"
echo " 4.7 523d939ef98fd712632d93a5a2b588e477a7565e"
echo " 4.7.0"
exit 1
}
@ -38,6 +48,9 @@ elif [[ ${BRANCH} =~ [0-9]*\.[0-9]*-rc[0-9] ]]; then
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
@ -51,7 +64,7 @@ else
cd raspberrypi-linux
fi
if [ -z "${KERNEL}" ]; then
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
@ -61,7 +74,9 @@ git config --local core.abbrev 40
git fetch --all --depth=${DEPTH}
git reset --hard origin/rpi-${BRANCH}.y${REBASE}
if [ -z "${KERNEL}" ]; then
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)"

View File

@ -14,23 +14,10 @@ TODO=$1
# Drop commits not used
DROP_COMMITS="
Add non-mainline source for rtl8192cu wireless driver version
rtl8192c_rf6052\: PHY_RFShadowRefresh\(\)\: fix off-by-one
rtl8192cu\: Add PID for D-Link DWA 131
Added Device IDs for August DVB-T 205
net\: Add non-mainline source for rtl8192cu wlan
net\: Fix rtl8192cu build errors on other platforms
Enable cfg80211 support
suppress spurious messages
Add #if for 3\.14 kernel change \(#87\)
Set dev_type to wlan
Tentatively added support for more 8188CUS based devices\.
Add support for more 8188CUS and 8192CUS devices
Add ProductId for the Netgear N150 - WNA1000M
Fixes CONFIG_CONCURRENT_MODE CONFIG_MULTI_VIR_IFACES
Fixes compatibility with 3\.13
Enables warning in the compiler and fixes some issues, reference => https\:\/\/github\.com\/diederikdehaas\/rtl8812AU
Starts device in station mode instead of monitor, fixes NetworkManager issues
Added Device IDs for August DVB-T 205
#Enable cfg80211 support
"
IFS=$'\n'