Merge branch 'master' into i486

4 files changed, 3 insertions, 33 deletions

diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD
index a0447e94..481098cc 100644
--- a/core/linux/PKGBUILD
+++ b/core/linux/PKGBUILD
@@ -6,7 +6,7 @@ source_i486=('config.i486')
 for ((i=0; i<${#sha256sums[@]}; i++)); do
   if [ "${sha256sums[${i}]}" = '321af63cf7dc8e79531ddd8634eddba19e40a18335e7ce61eedd0ad72fef89a5' ]; then
     sha256sums_i686=('421086408df4ab3fab0aac1161c4a82cd6256f0b92b30a44259be4c4f59e0c60')
-    sha256sums_i486=('4fd1e49bda5c69ebbfec332e532f2fc83146861bbdde581f62b229c9f54bb336')
+    sha256sums_i486=('2795827c56fddbd0fb7516cfd33fdd672cf75a15c1788b9c34ed4483758b95b5')
   fi
 done
 
diff --git a/core/linux/config.i486 b/core/linux/config.i486
index 109bd586..401d5c55 100644
--- a/core/linux/config.i486
+++ b/core/linux/config.i486
@@ -54,8 +54,8 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-ARCH"
-# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y
diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index 3e010da8..154fb2ee 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,19 +1,4 @@
 # i486-specific
 if [ "${CARCH}" = "i486" ]; then
   _JARCH=i386
-
-  # a lot of things missing during bootstrapping
-  makedepends=(${makedepends[@]//libpulse>=0.9.11/})
-  makedepends=(${makedepends[@]//gtk2/})
-  makedepends=(${makedepends[@]//java-rhino/})
-  makedepends=(${makedepends[@]//eclipse-ecj/})
-
-  eval "$(
-    declare -f build | \
-      sed '
-        s|--with-rhino|--without-rhino|
-        s|--with-jdk-home=${JAVA_HOME}|--with-jdk-home=/opt/jdk7-openjdk|
-      '
-  )"
-
 fi
diff --git a/extra/java8-openjdk/PKGBUILD b/extra/java8-openjdk/PKGBUILD
index e1f5e163..0a99ad97 100644
--- a/extra/java8-openjdk/PKGBUILD
+++ b/extra/java8-openjdk/PKGBUILD
@@ -21,19 +21,4 @@ eval "$(
 # i486-specific
 if [ "${CARCH}" = "i486" ]; then
   _JARCH=i386
-
-  # a lot of things missing during bootstrapping
-  makedepends=(${makedepends[@]//libpulse>=0.9.11/})
-  makedepends=(${makedepends[@]//gtk2/})
-  makedepends=(${makedepends[@]//java-rhino/})
-  makedepends=(${makedepends[@]//eclipse-ecj/})
-
-  eval "$(
-    declare -f build | \
-      sed '
-        s|--with-rhino|--without-rhino|
-        s|--with-jdk-home=${JAVA_HOME}|--with-jdk-home=/opt/jdk7-openjdk|
-      '
-  )"
-
 fi