Merge pull request #34 from jrmakosky/master

Updates to work with OpenBSD 5.4
kirei · Jan 25, 2014 · 209e1b5 · 209e1b5
2 parents 83af7cb + 8ae5bff
commit 209e1b5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/build-release-injail.sh b/build-release-injail.sh
@@ -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

diff --git a/build-release.sh b/build-release.sh
@@ -6,8 +6,8 @@ WORKDIR=sandbox
 export CWD WORKDIR
 
 # Update for each new release
-SHORTREL="53"
+SHORTREL="54"
-LONGREL="5.3"
+LONGREL="5.4"
 
 # No need to change anything below this line for new OS releases!
 

diff --git a/mk-mini.conf b/mk-mini.conf
@@ -1,4 +1,3 @@
-WARNINGS=yes
 PIPE=-pipe
 STATIC=
 DEBUG=