sync from upstream

This commit is contained in:
Louis Abel 2023-05-16 04:01:23 -07:00
parent 3aff6ed6e3
commit d5d2476b71
Signed by: label
GPG Key ID: B37E62D143879B36
2 changed files with 21 additions and 0 deletions

View File

@ -80,6 +80,7 @@ additional_packages = [
"ecj", #ENGCMP-2939 "ecj", #ENGCMP-2939
"egl-utils", "egl-utils",
"frr-selinux", "frr-selinux",
"gcc-toolset-13-annobin",
"inkscape1", "inkscape1",
"inkscape1-docs", "inkscape1-docs",
"inkscape1-view", "inkscape1-view",

20
sync-from-upstream Executable file
View File

@ -0,0 +1,20 @@
#!/bin/bash
HOWMANY="-$1"
if [ -z $1 ]; then
HOWMANY="-1"
fi
BRANCH=$(git branch --show-current)
if [[ ! "${BRANCH}" =~ "r8s" ]]; then
echo "Not a lookahead branch."
exit 1
fi
echo "Fetching from upstream"
git fetch https://gitlab.com/redhat/centos-stream/release-engineering/pungi-centos.git centos-8-stream
echo "Formatting patch and applying..."
git format-patch --stdout ${HOWMANY} FETCH_HEAD | sed -e 's|centos/|rocky/|' | git apply
echo "!! DIFF OF CHANGES !!"
git --no-pager diff HEAD
echo "You may now commit and push."