Permalink
Browse files

Merge pull request #34 from jrmakosky/master

Updates to work with OpenBSD 5.4
  • Loading branch information...
2 parents 83af7cb + 8ae5bff commit 209e1b509373131324373ff7bbcfbbf2aa81c27e @jschlyter jschlyter committed Jan 25, 2014
Showing with 6 additions and 3 deletions.
  1. +4 −0 build-release-injail.sh
  2. +2 −2 build-release.sh
  3. +0 −1 mk-mini.conf
View
@@ -6,6 +6,10 @@ cd /usr/src
echo "Patching src.."
for file in /patches/*.patch; do
+ if [ `egrep -c '^RCS file: /cvs/OpenBSD/xenocara' ${file}` -ge 1 ]; then
+ echo "skipping xenocara patch $file"
+ continue;
+ fi
echo "patching ${file} to ${WORKDIR}/usr/src"
patch -p0 < ${file}
done
View
@@ -6,8 +6,8 @@ WORKDIR=sandbox
export CWD WORKDIR
# Update for each new release
-SHORTREL="53"
-LONGREL="5.3"
+SHORTREL="54"
+LONGREL="5.4"
# No need to change anything below this line for new OS releases!
View
@@ -1,4 +1,3 @@
-WARNINGS=yes
PIPE=-pipe
STATIC=
DEBUG=

0 comments on commit 209e1b5

Please sign in to comment.