Accepting request 875994 from hardware👢staging

OBS-URL: https://build.opensuse.org/request/show/875994
OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=131
This commit is contained in:
Matthias Brugger 2021-03-01 15:55:53 +00:00 committed by Git OBS Bridge
parent 07af4392c6
commit 056bfead3a
2 changed files with 12 additions and 9 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 1 13:13:54 UTC 2021 - Matthias Gerstner <matthias.gerstner@suse.com>
- update_git.sh: use safe tmp directories, use authenticated https://
procotol.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 1 09:36:17 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org> Mon Mar 1 09:36:17 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>

View File

@ -11,15 +11,14 @@
set -e set -e
GIT_TREE=git://github.com/openSUSE/u-boot.git GIT_TREE=https://github.com/openSUSE/u-boot.git
GIT_LOCAL_TREE=~/src/opensuse/u-boot GIT_LOCAL_TREE=~/src/opensuse/u-boot
GIT_BRANCH=tumbleweed-2021.01 GIT_BRANCH=tumbleweed-2021.01
GIT_UPSTREAM_TAG=v2021.01 GIT_UPSTREAM_TAG=v2021.01
GIT_DIR=/dev/shm/u-boot-factory-git-dir GIT_DIR=`mktemp -d -p /dev/shm`
CMP_DIR=/dev/shm/u-boot-factory-cmp-dir CMP_DIR=`mktemp -d -p /dev/shm`
rm -rf $GIT_DIR trap 'rm -rf "$GIT_DIR" "$CMP_DIR"' EXIT
rm -rf $CMP_DIR
if [ -d "$GIT_LOCAL_TREE" ] || [ -L "$GIT_LOCAL_TREE" ]; then if [ -d "$GIT_LOCAL_TREE" ] || [ -L "$GIT_LOCAL_TREE" ]; then
echo "Processing $GIT_BRANCH branch of local git tree, using tag:" \ echo "Processing $GIT_BRANCH branch of local git tree, using tag:" \
@ -57,7 +56,6 @@ fi
UBOOT_VERSION="${UBOOT_VERSION}${UBOOT_EXTRAVERSION}" UBOOT_VERSION="${UBOOT_VERSION}${UBOOT_EXTRAVERSION}"
echo "U-Boot version: $UBOOT_VERSION" echo "U-Boot version: $UBOOT_VERSION"
rm -rf $GIT_DIR
( (
CHANGED_COUNT=0 CHANGED_COUNT=0
@ -70,9 +68,10 @@ rm -rf $GIT_DIR
# Process patches to eliminate useless differences: limit file names to 40 chars # Process patches to eliminate useless differences: limit file names to 40 chars
# before extension and remove git signature. ('32' below gets us past dir prefix) # before extension and remove git signature. ('32' below gets us past dir prefix)
for i in $CMP_DIR/*; do for i in $CMP_DIR/*; do
base=`basename "$i"`
# format-patch may append a signature, which per default contains the git version # format-patch may append a signature, which per default contains the git version
# wipe everything starting from the signature tag # wipe everything starting from the signature tag
sed '/^-- $/Q' $i > $CMP_DIR/${i:32:40}.patch sed '/^-- $/Q' $i > $CMP_DIR/${base:0:40}.patch
rm $i rm $i
done done
@ -128,8 +127,6 @@ rm -rf $GIT_DIR
echo " added: $ADDED_COUNT" echo " added: $ADDED_COUNT"
) )
rm -rf $CMP_DIR
echo "Updating patch list" echo "Updating patch list"
# Handle patch list automatically in spec file # Handle patch list automatically in spec file
patch_list=`ls 0*.patch` patch_list=`ls 0*.patch`