From d9c6f56c2ea171cbc1fa396feb30d2814b9a818d Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 14 Sep 2015 19:50:13 +0200
Subject: [PATCH 1/3] pakfire: use correct tree on x86_64.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---
 lfs/pakfire | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lfs/pakfire b/lfs/pakfire
index 6f90f89bb..00d1bb1c0 100644
--- a/lfs/pakfire
+++ b/lfs/pakfire
@@ -30,10 +30,10 @@ THISAPP    = pakfire
 DIR_APP    = /opt/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
-ifeq "$(MACHINE_TYPE)" "arm"
-	PAKFIRE_VERSION = $(VERSION)-$(MACHINE)
-else
+ifeq "$(MACHINE)" "i586"
 	PAKFIRE_VERSION = $(VERSION)
+else
+	PAKFIRE_VERSION = $(VERSION)-$(MACHINE)
 endif
 
 ###############################################################################

From 7f69895cb57bc6a41cdcb5b3725dd8f2bd21643f Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 14 Sep 2015 19:50:58 +0200
Subject: [PATCH 2/3] make.sh: generate correct SYSTEM_RELEASE string if
 --target= was used.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---
 make.sh | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/make.sh b/make.sh
index da8c17c36..375f72d3a 100755
--- a/make.sh
+++ b/make.sh
@@ -86,21 +86,6 @@ if [ -z $EDITOR ]; then
 	[ -z $EDITOR ] && exiterror "You should have installed an editor."
 fi
 
-# Prepare string for /etc/system-release.
-SYSTEM_RELEASE="${NAME} ${VERSION} (${MACHINE})"
-if [ "$(git status -s | wc -l)" == "0" ]; then
-	GIT_STATUS=""
-else
-	GIT_STATUS="-dirty"
-fi
-case "$GIT_BRANCH" in
-	core*|beta?|rc?)
-		SYSTEM_RELEASE="${SYSTEM_RELEASE} - $GIT_BRANCH$GIT_STATUS"
-		;;
-	*)
-		SYSTEM_RELEASE="${SYSTEM_RELEASE} - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT$GIT_STATUS"
-		;;
-esac
 
 prepareenv() {
     ############################################################################
@@ -240,6 +225,22 @@ prepareenv() {
 
     # Remove pre-install list of installed files in case user erase some files before rebuild
     rm -f $BASEDIR/build/usr/src/lsalr 2>/dev/null
+
+    # Prepare string for /etc/system-release.
+    SYSTEM_RELEASE="${NAME} ${VERSION} (${MACHINE})"
+    if [ "$(git status -s | wc -l)" == "0" ]; then
+	GIT_STATUS=""
+    else
+	GIT_STATUS="-dirty"
+    fi
+    case "$GIT_BRANCH" in
+	core*|beta?|rc?)
+		SYSTEM_RELEASE="${SYSTEM_RELEASE} - $GIT_BRANCH$GIT_STATUS"
+		;;
+	*)
+		SYSTEM_RELEASE="${SYSTEM_RELEASE} - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT$GIT_STATUS"
+		;;
+    esac
 }
 
 buildtoolchain() {

From 253983268e74482b0e032daf398625544c3a370e Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 14 Sep 2015 22:33:29 +0200
Subject: [PATCH 3/3] backports: disabled on x86_64.

There is a duplicate kernel modul symbol in compat layer so backports modules will not load.
I will debug this at next kernel update.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---
 make.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/make.sh b/make.sh
index 375f72d3a..fb417d57e 100755
--- a/make.sh
+++ b/make.sh
@@ -421,10 +421,10 @@ buildipfire() {
   case "${TARGET_ARCH}" in
 	x86_64)
 		ipfiremake linux			KCFG=""
-		ipfiremake backports			KCFG=""
+#		ipfiremake backports			KCFG=""
 		ipfiremake cryptodev			KCFG=""
 		ipfiremake e1000e			KCFG=""
-#		ipfiremake igb				KCFG=""
+		ipfiremake igb				KCFG=""
 		ipfiremake ixgbe			KCFG=""
 		ipfiremake xtables-addons		KCFG=""
 		ipfiremake linux-initrd			KCFG=""