diff options
| -rw-r--r-- | PatchList.txt | 76 | ||||
| -rw-r--r-- | TODO | 10 | ||||
| -rwxr-xr-x | scripts/check-TODO.sh | 27 | ||||
| -rwxr-xr-x | scripts/check-patchlist.sh | 113 | ||||
| -rwxr-xr-x | scripts/combine.sh | 34 | ||||
| -rwxr-xr-x | scripts/grab-logs.sh | 35 | ||||
| -rwxr-xr-x | scripts/newpatch.sh | 42 |
7 files changed, 0 insertions, 337 deletions
diff --git a/PatchList.txt b/PatchList.txt deleted file mode 100644 index c7945639d..000000000 --- a/PatchList.txt +++ /dev/null @@ -1,76 +0,0 @@ -# This file contains patches that we intend to carry for longer than -# "Should show up in a stable release soonish" -# Some of these may eventually drop out - -kbuild-AFTER_LINK.patch - -arm64-avoid-needing-console-to-enable-serial-console.patch - -geekbox-v4-device-tree-support.patch - -Initial-AllWinner-A64-and-PINE64-support.patch - -arm64-pcie-quirks-xgene.patch - -usb-phy-tegra-Add-38.4MHz-clock-table-entry.patch - -ARM-tegra-usb-no-reset.patch - -bcm283x-upstream-fixes.patch - -lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch - -input-kill-stupid-messages.patch - -die-floppy-die.patch - -no-pcspkr-modalias.patch - -silence-fbcon-logo.patch - -Kbuild-Add-an-option-to-enable-GCC-VTA.patch - -crash-driver.patch - -#Secure boot patches -Add-secure_modules-call.patch -PCI-Lock-down-BAR-access-when-module-security-is-ena.patch -x86-Lock-down-IO-port-access-when-module-security-is.patch -ACPI-Limit-access-to-custom_method.patch -asus-wmi-Restrict-debugfs-interface-when-module-load.patch -Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch -acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch -kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch -x86-Restrict-MSR-access-when-module-loading-is-restr.patch -Add-option-to-automatically-enforce-module-signature.patch -efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch -efi-Add-EFI_SECURE_BOOT-bit.patch -hibernate-Disable-in-a-signed-modules-environment.patch -Add-EFI-signature-data-types.patch -Add-an-EFI-signature-blob-parser-and-key-loader.patch -KEYS-Add-a-system-blacklist-keyring.patch -MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch -MODSIGN-Support-not-importing-certs-from-db.patch -Add-sysrq-option-to-disable-secure-boot-mode.patch -kexec-uefi-copy-secure_boot-flag-in-boot-params.patch - -drm-i915-hush-check-crtc-state.patch - -disable-i8042-check-on-apple-mac.patch - -lis3-improve-handling-of-null-rate.patch - -scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch - -criu-no-expert.patch - -ath9k-rx-dma-stop-check.patch - -xen-pciback-Don-t-disable-PCI_COMMAND-on-PCI-device-.patch - -Input-synaptics-pin-3-touches-when-the-firmware-repo.patch - -firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch - -drm-i915-turn-off-wc-mmaps.patch - @@ -1,10 +0,0 @@ -Config TODOs: -* review & disable a bunch of the I2C, RTC, DVB, SOUND options. - -Spec file TODOs: - -* modules-extra: Do a few more things to make it a bit more robust. - - Allow for comments in the mod-extra.list file. - - Don't fail the build if a module is listed but not built (maybe). - - See if it can be tied into Kconfig instead of module names. - diff --git a/scripts/check-TODO.sh b/scripts/check-TODO.sh deleted file mode 100755 index 7067f0b44..000000000 --- a/scripts/check-TODO.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -for i in `grep ^* TODO | awk '{ print $2 }'` -do - if [ ! -f $i ]; then - echo "$i referenced in the TODO, but isn't in CVS!" - fi; -done - -# sometimes dead stuff lingers in cvs, even though it's not in the specfile. -for i in *.patch -do - for j in $(grep $i kernel.spec | grep Apply.*Patch | awk '{ print $2 }' | wc -l) - do - if [ "$j" = "0" ]; then - echo $i is in CVS, but not applied in spec file. - grep $i TODO | awk '{ print $2 " is also still in the TODO" }' - fi - done -done - -#for i in `grep ApplyPatch kernel.spec | awk '{ print $2 }'` -#do -# R=$(grep $i TODO) -# echo "$i is in CVS, but not mentioned in the TODO!" -#done - diff --git a/scripts/check-patchlist.sh b/scripts/check-patchlist.sh deleted file mode 100755 index 134e41e97..000000000 --- a/scripts/check-patchlist.sh +++ /dev/null @@ -1,113 +0,0 @@ -#! /bin/sh -# This script was created in a effort to make patch management a bit easier. -# It list all the patches in the current tree and identifies if they are -# present in the kernel.spec, PatchList.txt, both files or neither. -# -# eg. ./check-patchlist.sh [optional flag] - -function usage(){ - echo "List all the patches currently in the tree. It also helps identify" - echo "if the patch is present in kernel.spec or PatchList.txt. " - echo "-h, --help " - echo "-t, --tracked patches in both kernel.spec and PatchList.txt " - echo "-p, --patchlist patches added to PatchList.txt. " - echo "-s, --specfile patches added to kernel.spec. " - echo "-n, --not-tracked patches in the tree but not in PatchList.txt " - echo " or kernel.spec " -} - -BASEDIR=$(dirname "$( cd $(dirname $BASH_SOURCE[0]) && pwd)") -pushd $BASEDIR > /dev/null - -function list_all(){ - echo "===========Legend===========================" - echo ". In kernel.spec " - echo "* In PatchList.txt " - echo "+ In PatchList.txt & Kernel.spec " - echo "- Neither in PatchList.txt nor kernel.spec" - echo "============================================" - for patch in $(ls *.patch); do - if [ ! -z "$(grep $patch PatchList.txt)" ] && [ ! -z "$(grep $patch kernel.spec)" ] - then - echo "+ ${patch}" # Patches in kernel.spec and PatchList.txt - - elif [ ! -z "$(grep $patch PatchList.txt)" ] && [ -z "$(grep $patch kernel.spec)" ] - then - echo "* ${patch}" # Patches in PatchList.txt but not in kernel.spec - - elif [ -z "$(grep $patch PatchList.txt)" ] && [ ! -z "$(grep $patch kernel.spec)" ] - then - echo ". ${patch}" # Patches in kernel.spec but not in PatchList.txt - - else - echo "- ${patch}" # Neither in PatchList.txt nor kernel.spec - - fi - done -} - -function list_present_not_added(){ - for patch in $(ls *.patch); do - if [ -z "$(grep $patch PatchList.txt)" ] && [ -z "$(grep $patch kernel.spec)" ] - then - echo $patch - fi - done -} - -function list_present_added(){ - for patch in $(ls *.patch); do - if [ ! -z "$(grep $patch PatchList.txt)" ] && [ ! -z "$(grep $patch kernel.spec)" ] - then - echo $patch - fi - done -} - -function list_patchList(){ - for patch in $(ls *.patch); do - if [ ! -z "$(grep $patch PatchList.txt)" ] && [ -z "$(grep $patch kernel.spec)" ] - then - echo $patch - fi - done - -} -function list_specfile(){ - for patch in $(ls *.patch); do - if [ -z "$(grep $patch PatchList.txt)" ] && [ ! -z "$(grep $patch kernel.spec)" ] - then - echo $patch - fi - done -} - -if [ -z "$@" ]; then - list_all -else - - for opt in "$@"; do - case $opt in - -t|--tracked) - list_present_added - ;; - -s|--specfile) - list_specfile - ;; - -h|--help) - usage - ;; - -n|--not-added) - list_present_not_added - ;; - -p|--patchlist) - list_patchList - ;; - *) - usage - ;; - esac - done -fi - -popd > /dev/null diff --git a/scripts/combine.sh b/scripts/combine.sh deleted file mode 100755 index 86a68d302..000000000 --- a/scripts/combine.sh +++ /dev/null @@ -1,34 +0,0 @@ -#! /bin/sh - -# combine a set of quilt patches - -# $1 : base dir (source tree) -# $2 : quilt dir (patches to apply) -# $3 : pre-patch to apply first (optional) - -# e.g.: -# combine.sh /home/user/fedora/trunk/kernel/F-11/kernel-2.6.30/vanilla-2.6.30 \ -# /home/user/git/stable-queue/queue-2.6.30 \ -# /home/user/fedora/trunk/kernel/F-11/patch-2.6.30.5.bz2 - -if [ $# -lt 2 ] ; then - exit 1 -fi - -TD="combine_temp.d" - -cd $1 || exit 1 -cd .. -[ -d $TD ] && rm -Rf $TD -mkdir $TD || exit 1 -cd $TD - -cp -al ../$(basename $1) work.d -cd work.d -[ "$3" ] && bzcat $3 | patch -p1 -s -ln -s $2 patches -[ -h patches ] || exit 1 -quilt snapshot -quilt upgrade -quilt push -a -q -quilt diff --snapshot >../combined.patch diff --git a/scripts/grab-logs.sh b/scripts/grab-logs.sh deleted file mode 100755 index 571b503bb..000000000 --- a/scripts/grab-logs.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# Script helps download the build logs for the current tree. -# The downloaded logs will be saved in a logs/ within the -# tree. - -BASEDIR="$(dirname "$(cd $(dirname $BASH_SOURCE[0]) && pwd)")" -pushd $BASEDIR > /dev/null - -VER=$(fedpkg verrel) -ver=$(echo $VER | sed -e 's/-/ /g' | awk '{print $2}') -rev=$(echo $VER | sed -e 's/-/ /g' | awk '{print $3}') - -# keep logs in one place. If logs directory does not exist, make it. -if [ -d "$BASEDIR/logs" ]; then - DIR="$BASEDIR/logs" -else - mkdir "$BASEDIR/logs" - DIR="$BASEDIR/logs" -fi - -# Common architectures that have build logs. -ARCHS[0]=i686 -ARCHS[1]=x86_64 -ARCHS[2]=noarch -ARCHS[3]=armv7hl - -for arch in ${ARCHS[@]}; do - URL=http://kojipkgs.fedoraproject.org/packages/kernel/$ver/$rev/data/logs/$arch/build.log - # Only download logs if exist - wget --spider -q $URL - if [ $? -eq 0 ]; then - wget -O $DIR/build-$VER-$arch.log $URL - fi -done -popd > /dev/null diff --git a/scripts/newpatch.sh b/scripts/newpatch.sh deleted file mode 100755 index 2d7498655..000000000 --- a/scripts/newpatch.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -# Facilitates the addition of a new patch to the source tree. -# -- Moves patch to tree -# -- Adds patch to kernel.spec list of patches -# -- Adds patch to git -# -- change buildid macro to the name of the patch being added - -# Base directory is relative to where the script is. -BASEDIR="$(dirname "$(cd $(dirname $BASH_SOURCE[0]) && pwd)")" -pushd $BASEDIR > /dev/null -# Check for at least patch -if [ "$#" -lt 1 ]; then - echo "usage: $0 [ /path/to/patch/ ] [ description ]" - exit 1 -fi -PATCHDIR=$1 -DESC=$2 -PATCH="$(basename "$PATCHDIR")" -# Kernel.spec file in the current tree -SPECFILE="$BASEDIR/kernel.spec" -# If adding patch from outside the source tree move it to the source tree -if [ -z "$(ls | grep $PATCH)" ]; then - cp $PATCHDIR $BASEDIR/ -fi - -if [ ! -z "$(grep $PATCH $SPECFILE)" ] -then - echo "$PATCH already in kernel.spec" - exit 1 -fi -# ID number of the last patch in kernel.spec -LPATCH_ID=$(grep ^Patch $SPECFILE | tail -n1 | awk '{ print $1 }' | sed s/Patch// | sed s/://) -# ID of the next patch to be added to kernel.spec -NPATCH_ID=$(($LPATCH_ID + 1 )) -# Add patch with new id at the end of the list of patches -sed -i "/^Patch$LPATCH_ID:\ /a#\ $DESC\nPatch$NPATCH_ID:\ $PATCH" $SPECFILE -# Add it to git -git add $PATCH -BUILDID_PATCH="$(echo $PATCH | sed 's/\-/\_/g' )" -sed -i "s/^.*define buildid .*$/%define buildid .$BUILDID_PATCH/" $SPECFILE -popd > /dev/null |