diff options
author | Alexey Neyman <stilor@att.net> | 2017-12-02 23:30:38 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-02 23:30:38 (GMT) |
commit | d917a29865876b913fe2939ee2a0728145e8543a (patch) | |
tree | 4e048ed57988306696efa3c5b81a80d48030e913 /maintainer | |
parent | e832b9b220f90b11b893e2815ceb37ec2b708683 (diff) | |
parent | 98bc4decdeab1361bdc585c86591718fb08c8ffb (diff) |
Merge pull request #874 from stilor/renumber-update-patches
Renumber & update patches
Diffstat (limited to 'maintainer')
-rwxr-xr-x | maintainer/manage-packages.sh (renamed from maintainer/test-packages.sh) | 66 | ||||
-rwxr-xr-x | maintainer/patch-renumber.sh | 68 | ||||
-rwxr-xr-x | maintainer/patch-rework.sh | 196 |
3 files changed, 63 insertions, 267 deletions
diff --git a/maintainer/test-packages.sh b/maintainer/manage-packages.sh index 7cc82d5..336237c 100755 --- a/maintainer/test-packages.sh +++ b/maintainer/manage-packages.sh @@ -24,6 +24,10 @@ Options: --apply-patches, -a Implies -d. Unpack and apply the bundled patches. + --update-patches, -P + Implies -d. Renumber the patches and update the offsets + in them. Requires quilt to be installed. + --verify-urls, -u Check *all* the download URLs for accessibility, without actually downloading anything. @@ -54,6 +58,10 @@ while [ -n "${1}" ]; do apply_patches=y download_pkgs=y ;; + --update-patches|-P) + update_patches=y + download_pkgs=y + ;; --select|-s) shift [ -n "${1}" ] || { echo "argument required for --select" >&2; exit 1; } @@ -85,6 +93,7 @@ CT_TARBALLS_DIR=`pwd`/temp.tarballs CT_COMMON_SRC_DIR=`pwd`/temp.src CT_SRC_DIR=`pwd`/temp.src CT_LOG_LEVEL_MAX=EXTRA +CT_TEMP_PATCH_DIR=`pwd`/temp.patches mkdir -p ${CT_TARBALLS_DIR} # Does not matter, just to make the scripts load @@ -165,6 +174,51 @@ create_digests() archive_formats="${save_archive_formats}" } +update_patches() +{ + local masterpfx="${1}" + local pkgdir="${CT_LIB_DIR}/packages/${pkg_name}/${version}" + local p i base newname + + CT_DoExecLog ALL rm -rf "${CT_TEMP_PATCH_DIR}" + CT_DoExecLog ALL mkdir -p "${CT_TEMP_PATCH_DIR}" + + # Move old patches so that CT_DoExtractPatch produces a clean directory + for p in "${pkgdir}"/*.patch; do + if [ "${p}" = "${pkgdir}/*.patch" ]; then + return # No patches + fi + CT_DoExecLog ALL mv "${p}" "${CT_TEMP_PATCH_DIR}" + done + # NOTE: we're already inside CT_PackageRun, so use CT_DoExtractPatch rather + # than CT_ExtractPatch, so that we keep the variable modified by it. + CT_DoExtractPatch + CT_DoLog EXTRA "Pushing patches into quilt" + CT_Pushd "${src_dir}/${dir_name}" + export QUILT_PATCHES=ct-ng.patches + CT_DoExecLog ALL mkdir -p ${QUILT_PATCHES} + CT_DoExecLog ALL touch ${QUILT_PATCHES}/series + CT_DoExecLog ALL quilt --quiltrc - setup ct-ng.patches/series + for p in "${CT_TEMP_PATCH_DIR}"/*.patch; do + # By now we know we have a non-empty set of patches + CT_DoExecLog ALL quilt --quiltrc - import "${p}" + CT_DoExecLog ALL quilt --quiltrc - push + CT_DoExecLog ALL quilt --quiltrc - refresh -p ab --no-timestamps --no-index --diffstat + done + # Now publish the patches back into the package's directory, renumbering them + # in the process. + CT_DoLog EXTRA "Saving updated patches" + i=0 + for p in `quilt --quiltrc - applied`; do + # Strip index separated by dash or underscore + base=`echo "${p}" | sed 's#^[0-9]\{2,4\}[-_]##'` + newname=`printf "%04u-%s" "${i}" "${base}"` + i=$[i+1] + CT_DoExecLog ALL mv "${QUILT_PATCHES}/${p}" "${pkgdir}/${newname}" + done + CT_Popd +} + run_pkgversion() { while [ -n "${1}" ]; do @@ -214,6 +268,7 @@ CT_${pfx}_V_${kcfg}=y CT_SAVE_TARBALLS=y # CT_VERIFY_DOWNLOAD_DIGEST is not set ${signature+CT_VERIFY_DOWNLOAD_SIGNATURE=y} +# CT_OVERRIDE_CONFIG_GUESS_SUB is not set EOF ./kconfig/conf --defconfig=temp.defconfig temp.in >/dev/null @@ -233,10 +288,15 @@ EOF CT_Fetch "${masterpfx}" fi if [ -n "${apply_patches}" ]; then - rm -rf ${CT_COMMON_SRC_DIR} - mkdir -p ${CT_COMMON_SRC_DIR} + CT_DoExecLog ALL rm -rf ${CT_COMMON_SRC_DIR} + CT_DoExecLog ALL mkdir -p ${CT_COMMON_SRC_DIR} CT_ExtractPatch "${masterpfx}" fi + if [ -n "${update_patches}" ]; then + CT_DoExecLog ALL rm -rf ${CT_COMMON_SRC_DIR} + CT_DoExecLog ALL mkdir -p ${CT_COMMON_SRC_DIR} + CT_PackageRun "${masterpfx}" update_patches + fi CT_EndStep } @@ -245,4 +305,4 @@ EOF . maintainer/package-versions [ -r .config-saved ] && mv .config-saved .config -rm -rf ${CT_TARBALLS_DIR} ${CT_COMMON_SRC_DIR} +CT_DoExecLog ALL rm -rf ${CT_TARBALLS_DIR} ${CT_COMMON_SRC_DIR} ${CT_TEMP_PATCH_DIR} diff --git a/maintainer/patch-renumber.sh b/maintainer/patch-renumber.sh deleted file mode 100755 index c9650ce..0000000 --- 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} <src_dir> <dst_dir> <base> <inc> [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 d05d2c1..0000000 --- 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##*/} <basedir> <src> <dst> [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 </dev/fd/7 - - exec 7<&- - exec <&6 - - return ${ret} -} - -# Iterate through patches -for p in "${src}/"*.patch; do - pname="$( basename "${p}" )" - - printf "Handling patch '${pname}'...\n" - - printf " creating reference..." - cp -a "${base}" "${base}.orig" - printf " done\n" - - printf " retrieving patch comment..." - comment="$( awk ' -BEGIN { mark=0; } -$0~/^diff --/ { nextfile; } -$1=="---" { mark=1; next; } -$1=="+++" && mark==1 { nextfile; } -{ mark=0; print; } -' "${p}" )" - printf " done\n" - - printf " creating patched file list..." - diffstat -f 4 -r 2 -u -p 0 "${p}" \ - |head -n -1 \ - |awk '{ for(i=NF;i>=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" |