pool/xorg-x11-server
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 953299 from home:dirkmueller:branches:openSUSE:Factory:Rings:1-MinimalX

Browse Source 
- fix bashisms in pre_checkins.sh (bsc#1195391)

OBS-URL: https://build.opensuse.org/request/show/953299
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=817
This commit is contained in:
Stefan Dirsch 2022-02-10 20:36:08 +00:00 committed by Git OBS Bridge
parent 9567960c4b
commit e6988afd0e
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pre_checkin.sh
View File

@ -12,11 +12,11 @@ extract_abi() {
grep ^.define.*${1}_VERSION ${xorg_src}/hw/xfree86/common/xf86Module.h | tr '(),' ' .' | awk '{ print $4$5 }'
}
if [ "$1" == "--tar" ]; then
if [ "$1" = "--tar" ]; then
tmpdir=$(mktemp -d)
tar xf "$2" -C ${tmpdir}
xorg_src=${tmpdir}/*
elif [ "$1" == "--verify" ]; then
elif [ "$1" = "--verify" ]; then
xorg_src="$2"
prv_ext=".build"
else
@ -39,15 +39,18 @@ abi_videodrv=`extract_abi VIDEODRV`
abi_xinput=`extract_abi XINPUT`
abi_extension=`extract_abi EXTENSION`
A="Provides: X11_ABI_XINPUT = ${abi_xinput}\nProvides: X11_ABI_VIDEODRV = ${abi_videodrv}\nProvides: X11_ABI_ANSIC = ${abi_ansic}\nProvides: X11_ABI_EXTENSION = ${abi_extension}"
cat > xorg-server-provides${prv_ext} <<EOF
Provides: X11_ABI_XINPUT = ${abi_xinput}
Provides: X11_ABI_VIDEODRV = ${abi_videodrv}
Provides: X11_ABI_ANSIC = ${abi_ansic}
Provides: X11_ABI_EXTENSION = ${abi_extension}
EOF
echo -e $A > xorg-server-provides${prv_ext}
if [ "$1" == "--tar" ]; then
if [ "$1" = "--tar" ]; then
if [ -d ${tmpdir} ]; then
rm -rf ${tmpdir}
fi
elif [ "$1" == "--verify" ]; then
elif [ "$1" = "--verify" ]; then
diff "$3" xorg-server-provides${prv_ext}
if [ $? -gt 0 ]; then
echo "The ABI verification failed... please run $0 before checking in"

8
xorg-server-provides
View File

@ -1,4 +1,4 @@
Provides: X11_ABI_XINPUT = 24.4
Provides: X11_ABI_VIDEODRV = 25.2
Provides: X11_ABI_ANSIC = 0.4
Provides: X11_ABI_EXTENSION = 10.0
Provides: X11_ABI_XINPUT = 24.4
Provides: X11_ABI_VIDEODRV = 25.2
Provides: X11_ABI_ANSIC = 0.4
Provides: X11_ABI_EXTENSION = 10.0

5
xorg-x11-server.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Feb 10 20:26:44 UTC 2022 - Dirk Müller <dmueller@suse.com>
- fix bashisms in pre_checkins.sh (bsc#1195391)
-------------------------------------------------------------------
Mon Jan 3 21:03:34 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>