mirrors/acpica
1
0
Fork 0
mirror of https://github.com/acpica/acpica/ synced 2025-02-24 09:24:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix ACPICA release issues for recent distros

Browse Source 
Several issues were found in recent cygwin/ubuntu distros:

1. Newer git implements "-c" with different meaning, removes it;
2. "tempfile" is mostly debian specific command, replaces it with
   "mktemp -u", the latter is more portable.

Singed-off-by: Lv Zheng <lv.zheng@intel.com>
This commit is contained in:
Lv Zheng 2016-10-14 21:25:42 +08:00
parent cb8dfc8157
commit e97f20f3d6
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
generate/linux/gen-patch.sh
View File

@ -53,8 +53,8 @@ if [ "x${COMMIT}" = "x" ]; then
COMMIT=HEAD
fi
after=`git log -1 -c ${COMMIT} --format=%H | cut -c1-8`
before=`git log -1 -c ${COMMIT}^1 --format=%H | cut -c1-8`
after=`git log -1 ${COMMIT} --format=%H | cut -c1-8`
before=`git log -1 ${COMMIT}^1 --format=%H | cut -c1-8`
SCRIPT=`(cd \`dirname $0\`; pwd)`
. $SCRIPT/libacpica.sh
@ -97,8 +97,8 @@ generate_sobs()
# Arg 1: commit ID
generate_acpica_desc()
{
AUTHOR_NAME=`git log -c $1 -1 --format="%aN"`
AUTHOR_EMAIL=`git log -c $1 -1 --format="%aE"`
AUTHOR_NAME=`git log -1 $1 --format="%aN"`
AUTHOR_EMAIL=`git log -1 $1 --format="%aE"`
if [ "x${AUTHOR_NAME}" = "xRobert Moore" ]; then
AUTHOR_NAME="Bob Moore"
fi
@ -111,7 +111,7 @@ generate_acpica_desc()
FORMAT="From %H Mon Sep 17 00:00:00 2001%nFrom: $COMMITTER%nDate: %aD%nFrom: $AUTHOR%nSubject: [PATCH $INDEX] ACPICA: %s%n%nACPICA commit %H%n%n%b"
fi
GIT_LOG_FORMAT=`echo $FORMAT`
eval "git log -c $1 -1 --format=\"$GIT_LOG_FORMAT\""
eval "git log -1 $1 --format=\"$GIT_LOG_FORMAT\""
}
# Arg 1: patch description file
@ -225,8 +225,8 @@ mv -f $GP_acpica_repo/generate/linux/linux-$before $GP_linux_before
(
echo "[gen-patch.sh] Creating Linux patch (linux-$after.patch)..."
cd $CURDIR
tmpdiff=`tempfile`
tmpdesc=`tempfile`
tmpdiff=`mktemp -u`
tmpdesc=`mktemp -u`
diff -Nurp linux.before linux.after >> $tmpdiff
if [ $? -ne 0 ]; then

2
generate/linux/gen-repo.sh
View File

@ -34,7 +34,7 @@ do
done
shift $(($OPTIND - 1))
version=`git log -1 -c $1 --format=%H | cut -c1-8`
version=`git log -1 $1 --format=%H | cut -c1-8`
SCRIPT=`(cd \`dirname $0\`; pwd)`
. $SCRIPT/libacpica.sh

4
generate/linux/make-patches.sh
View File

@ -84,8 +84,8 @@ generate_patch()
aid=$2
lid=$3
COMMIT=`git log -1 -c $cid --format=%H | cut -c 1-8`
SUBJECT=`git log -1 -c $cid --format=%s`
COMMIT=`git log -1 $cid --format=%H | cut -c 1-8`
SUBJECT=`git log -1 $cid --format=%s`
echo "[make-patches.sh] Generating patch ($aid:$lid:$COMMIT: $SUBJECT)..."
(