From 2a1935f3ad41d360dd3d96a1b0486083293651dd Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Sat, 2 Dec 2017 12:23:31 -0800 Subject: [PATCH] Retire old scripts for handling patches Also rename test-packages -> manage-packages, it is no longer just testing. Signed-off-by: Alexey Neyman --- .../{test-packages.sh => manage-packages.sh} | 0 maintainer/patch-renumber.sh | 68 ------ maintainer/patch-rework.sh | 196 ------------------ 3 files changed, 264 deletions(-) rename maintainer/{test-packages.sh => manage-packages.sh} (100%) delete mode 100755 maintainer/patch-renumber.sh delete mode 100755 maintainer/patch-rework.sh diff --git a/maintainer/test-packages.sh b/maintainer/manage-packages.sh similarity index 100% rename from maintainer/test-packages.sh rename to maintainer/manage-packages.sh diff --git a/maintainer/patch-renumber.sh b/maintainer/patch-renumber.sh deleted file mode 100755 index c9650ce9..00000000 --- a/maintainer/patch-renumber.sh +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/sh -# Yes, this intends to be a true POSIX script file. -set -e - -myname="$0" - -# Parse the tools' paths configuration -# It is expected that this script is only to be run from the -# source directory of crosstool-NG, so it is trivial to find -# paths.sh (we can't use ". paths.sh", as POSIX states that -# $PATH should be searched for, and $PATH most probably doe -# not include "."), hence the "./". -. "./paths.sh" - -doUsage() { - cat <<_EOF_ -Usage: ${myname} [sed_re] - Renumbers all patches found in 'src_dir', starting at 'base', with an - increment of 'inc', and puts the renumbered patches in 'dst_dir'. - Leading digits are replaced with the new indexes, and a subsequent '_' - is replaced with a '-'. - If 'sed_re' is given, it is interpreted as a valid sed expression, and - is be applied to the patch name. - If the environment variable FAKE is set to 'y', then nothing gets done, - the command to run is only be printed, and not executed (so you can - check beforehand). - 'dst_dir' must not yet exist. - Eg.: - patch-renumber.sh patches/gcc/4.2.3 patches/gcc/4.2.4 100 10 - patch-renumber.sh /some/dir/my-patches patches/gcc/4.3.1 100 10 's/(all[_-])*(gcc[-_])*//;' -_EOF_ -} - -[ $# -lt 4 -o $# -gt 5 ] && { doUsage; exit 1; } - -src="${1}" -dst="${2}" -cpt="${3}" -inc="${4}" -sed_re="${5}" -if [ ! -d "${src}" ]; then - printf "%s: '%s': not a directory\n" "${myname}" "${src}" - exit 1 -fi -if [ -d "${dst}" ]; then - printf "%s: '%s': directory already exists\n" "${myname}" "${dst}" - exit 1 -fi - -Q= -if [ -n "${FAKE}" ]; then - printf "%s: won't do anything: FAKE='%s'\n" "${myname}" "${FAKE}" - Q="echo" -fi - -${Q} mkdir -pv "${dst}" -for p in "${src}/"*.patch*; do - [ -e "${p}" ] || { echo "No such file '${p}'"; exit 1; } - newname="$(printf "%03d-%s" \ - "${cpt}" \ - "$( basename "${p}" \ - |${sed} -r -e 's/^[[:digit:]]+[-_]//' \ - -e "${sed_re}" \ - )" \ - )" - ${Q} cp -v "${p}" "${dst}/${newname}" - cpt=$((cpt+inc)) -done diff --git a/maintainer/patch-rework.sh b/maintainer/patch-rework.sh deleted file mode 100755 index d05d2c18..00000000 --- a/maintainer/patch-rework.sh +++ /dev/null @@ -1,196 +0,0 @@ -#!/bin/sh - -# Get our required options -base="$1" -src="$2" -dst="$3" -shift 3 - -# The remainder is for diff -diff="$@" - -do_help() { - cat <<-_EOF_ - ${0##*/}: transform a patchset of non-p1 patches into -p1 patches - - Usage: - ${0##*/} [diffopts ...] - - Where: - basedir - points to the directory of the component to patch - - src - points to the directory containing the existing patchset - to transform - - dst - points to the directory where to put transformed patches - - diffopts - optional options to pass to diff, for debug purposes. You - should not need it - - Example: - Transform Gentoo patches against gcc-4.4.2 (some of which are - -p0, -p1 or even -p2 patches) into all -p1 patches: - - tar xjf gcc-4.4.2.tar.bz2 - patch-rework.sh gcc-4.4.2 \\ - /path/to/gentoo/gcc/patches \\ - gcc-4.4.2.patches - _EOF_ -} - -# Sanity checks -if [ -z "${base}" \ - -o ! -d "${base}" \ - -o ! -d "${src}" \ - -o -e "${dst}" -a ! -d "${dst}" \ - ]; then - do_help - exit 1 -fi - -mkdir -p "${dst}" -base="${base%%/}" -src="$( cd "${src}"; pwd )" -dst="$( cd "${dst}"; pwd )" - -# This function checks that the files listed in the file in "$1" -# do exist, at the given depth-stripping level (aka diff -p#) -do_check_files_at_depth() { - local flist="$1" - local depth="$2" - local ret=0 # 0: OK, !0: KO - - exec 6<&0 - exec 7<"${flist}" - - while read f; do - f="$( echo "${f}" |sed -r -e "s:^([^/]+/){${depth}}::;" )" - [ -f "${f}" ] || ret=1 - done =NF-5;i--) { $(i) = ""; } print; }' \ - |sort \ - >"diffstat.orig" - printf " done\n" - - cd "${base}" - - # Check all files exist, up to depth 3 - printf " checking depth:" - d=0 - while [ $d -lt 4 ]; do - printf " ${d}" - if do_check_files_at_depth "../diffstat.orig" ${d}; then - printf " ok, using depth '${d}'\n" - break - fi - d=$((d + 1)) - done - if [ ${d} -ge 4 ]; then - printf "\n" - printf " checking depth failed\n" - read -p " --> enter patch depth (or Ctrl-C to abort): " d - fi - - # Store the original list of files touched by the patch, - # removing the $d leading components - sed -r -e "s:^([^/]+/){${d}}::;" "../diffstat.orig" >"${dst}/${pname}.diffstat.orig" - - # Apply the patch proper, and check it applied cleanly. - # We can't check with --dry-run because of patches that - # contain multiple accumulated patches onto a single file. - printf " applying patch..." - if ! patch -g0 -F1 -f -p${d} <"${p}" >"../patch.out" 2>&1; then - printf " ERROR\n\n" - cd - >/dev/null - printf "There was an error while applying:\n --> ${p} <--\n" - printf "'${base}' was restored to the state it was prior to applying this faulty patch.\n" - printf "Here's the 'patch' command, and its output:\n" - printf " ----8<----\n" - printf " patch -g0 -F1 -f -p${d} <'${p}'\n" - sed -r -e 's/^/ /;' "patch.out" - printf " ----8<----\n" - exit 1 - fi - printf " done\n" - - printf " removing '.orig' files..." - find . -type f -name '*.orig' -exec rm -f {} + - printf " done\n" - - cd - >/dev/null - - printf " re-diffing the patch..." - printf "%s\n\n" "${comment}" >"${dst}/${pname}" - diff -durN "${base}.orig" "${base}" >>"${dst}/${pname}" - printf " done\n" - - if [ -n "${diff}" ]; then - printf " applying diff filter..." - filterdiff -x "${diff}" "${dst}/${pname}" >"tmp-diff" - mv "tmp-diff" "${dst}/${pname}" - printf " done\n" - fi - - printf " creating new patched file list..." - diffstat -f 4 -r 2 -u -p 1 "${dst}/${pname}" \ - |head -n -1 \ - |awk '{ for(i=NF;i>=NF-5;i--) { $(i) = ""; } print; }' \ - |sort \ - >"${dst}/${pname}.diffstat.new" - printf " done\n" - - printf " removing temporary files/dirs..." - rm -f "patch.out" - rm -f "diffstat.tmp" - rm -f "diffstat.orig" - rm -rf "${base}.orig" - printf " done\n" -done - -# Scan all new patches to see if they touch -# more files than the original patches -printf "\nChecking resulting patchset:\n" -for p in "${dst}/"*.patch; do - pname="$( basename "${p}" )" - - if ! cmp "${p}.diffstat.orig" "${p}.diffstat.new" >/dev/null; then - printf " --> '${pname}' differ in touched files <--\n" - else - rm -f "${p}.diffstat.orig" "${p}.diffstat.new" - fi -done -printf " done.\n"