diff options
| author |   Eric Hameleers <alien@slackware.com> | 2007-01-14 16:52:19 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2007-01-14 16:52:19 +0000 |
| commit | fde607f8b84e9c230be1c8631c30c424f47c9df8 (patch) | |
| tree | 7374aa37a490ebfed0e96e9b9f374f87264219da /truecrypt/build | |
| parent | 3ee2f6be7392b42f8ff7b01d536fb1f20f779ecf (diff) | |
| download | asb-fde607f8b84e9c230be1c8631c30c424f47c9df8.tar.gz asb-fde607f8b84e9c230be1c8631c30c424f47c9df8.tar.xz | |
Fix compilation under 2.6.18 and 2.6.19 kernels
Diffstat (limited to 'truecrypt/build')
| -rwxr-xr-x | truecrypt/build/truecrypt.SlackBuild | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/truecrypt/build/truecrypt.SlackBuild b/truecrypt/build/truecrypt.SlackBuild index ea041618..8c528c18 100755 --- a/truecrypt/build/truecrypt.SlackBuild +++ b/truecrypt/build/truecrypt.SlackBuild @@ -18,6 +18,8 @@ # (so far, crypted containers could only be created in Windows). # 4.2a-1: 03/oct/2006 by Eric Hameleers <alien@slackware.com> # * Bugfix update. Reworked the SlackBuild too. +# 4.2a-2: 14/jan/2007 by Eric Hameleers <alien@slackware.com> +# * Fix compilation under kernels 2.6.18 and 2.6.19. # # Run 'sh SlackBuild --cleanup' to build a Slackware package. # The package (.tgz) plus descriptive .txt file are created in /tmp . @@ -37,7 +39,8 @@ DOCS="README.1st Readme.txt License.txt userguide.pdf" KVER=${KVER:-$(uname -r)} SOURCE="${PRGNAM}-${VERSION}-source-code.tar.gz" -PATCH="${PRGNAM}_ksrc.patch" +PATCH0="${PRGNAM}_ksrc.patch" +PATCH1="${PRGNAM}-4.2a-Dm-target.c--kernel-2.6.18-and-2.6.19.patch # Where do we look for sources? CWD=`pwd` @@ -152,13 +155,11 @@ find . -exec chmod +r {} \; echo Building ... -# Patch ./Linux/Kernel/Dm-target.c if it contains MSG_PREFIX (pre- 2.6.19) -# instead of DM_MSG_PREFIX if we build for kernel >= 2.6.19: -( cd Linux/Kernel - patch -p0 < $SRCDIR/dmerr.patch -) cd Linux -patch -p0 < $SRCDIR/${PATCH} +# Patches first: +patch -p0 < $SRCDIR/${PATCH0} 2>&1 | tee $OUTPUT/patch-${PRGNAM}.log +(cd Kernel && patch -p0 < $SRCDIR/${PATCH1} 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log) + CFLAGS="$SLKCFLAGS" \ ./build.sh 2>&1 | tee $OUTPUT/build-${PRGNAM}.log |