Fixes for poky master (#38)

* systemd: remove patch already merged upstream

Signed-off-by: Andrea Galbusera <gizero@gmail.com>

* sdcard: use deployed images from IMGDEPLOYDIR

Poky changed deployment directory from DEPLOY_DIR_IMAGE to
IMGDEPLOYDIR with commit 9cc449273252314fdc88cd62deb18a3e03d8abd5.
Change path to rootfs image in sdcard generation class accordingly

Signed-off-by: Andrea Galbusera <gizero@gmail.com>

3 files changed, 1 insertions, 53 deletions

diff --git a/classes/image_types_socfpga.bbclass b/classes/image_types_socfpga.bbclass
index a6dc78b..860752e 100644
--- a/classes/image_types_socfpga.bbclass
+++ b/classes/image_types_socfpga.bbclass
@@ -1,6 +1,6 @@
 inherit image_types
 
-SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
+SDCARD_ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext3"
 
 # Boot partition size [in KiB]
 IMAGE_ROOTFS_ALIGNMENT_cyclone5 ?= "2048"
diff --git a/recipes-core/systemd/systemd/0001-Add-support-for-nios2.patch b/recipes-core/systemd/systemd/0001-Add-support-for-nios2.patch
deleted file mode 100644
index 0ebf6c4..0000000
--- a/recipes-core/systemd/systemd/0001-Add-support-for-nios2.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From bf53c92c93c38abc6d98cc9ba405e905e8a2795d Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 16 May 2016 23:06:04 -0700
-Subject: [PATCH] Add support for nios2
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/shared/architecture.c | 2 ++
- src/shared/architecture.h | 5 +++++
- 2 files changed, 7 insertions(+)
-
-diff --git a/src/shared/architecture.c b/src/shared/architecture.c
-index a9ecfc1..4c46835 100644
---- a/src/shared/architecture.c
-+++ b/src/shared/architecture.c
-@@ -121,6 +121,8 @@ int uname_architecture(void) {
-                 { "tilegx",     ARCHITECTURE_TILEGX   },
- #elif defined(__cris__)
-                 { "crisv32",    ARCHITECTURE_CRIS     },
-+#elif defined(__nios2__)
-+                { "nios2",      ARCHITECTURE_NIOS2    },
- #else
- #error "Please register your architecture here!"
- #endif
-diff --git a/src/shared/architecture.h b/src/shared/architecture.h
-index 26679e2..7a4cbf3 100644
---- a/src/shared/architecture.h
-+++ b/src/shared/architecture.h
-@@ -57,6 +57,7 @@ enum {
-         ARCHITECTURE_M68K,
-         ARCHITECTURE_TILEGX,
-         ARCHITECTURE_CRIS,
-+        ARCHITECTURE_NIOS2,
-         _ARCHITECTURE_MAX,
-         _ARCHITECTURE_INVALID = -1
- };
-@@ -194,6 +195,10 @@ int uname_architecture(void);
- #elif defined(__cris__)
- #  define native_architecture() ARCHITECTURE_CRIS
- #  error "Missing LIB_ARCH_TUPLE for CRIS"
-+#elif defined(__nios2__)
-+#  define native_architecture() ARCHITECTURE_NIOS2
-+#  define LIB_ARCH_TUPLE "nios2-linux-gnu"
-+#  define PROC_CPUINFO_MODEL "cpu"
- #else
- #  error "Please register your architecture here!"
- #endif
--- 
-2.8.2
-
diff --git a/recipes-core/systemd/systemd_%.bbappend b/recipes-core/systemd/systemd_%.bbappend
deleted file mode 100644
index 7347e4c..0000000
--- a/recipes-core/systemd/systemd_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/systemd:"
-SRC_URI += "file://0001-Add-support-for-nios2.patch"