aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDrew Moseley <drew@moseleynet.net>2015-10-11 09:06:02 -0400
committerDrew Moseley <drew@moseleynet.net>2015-10-11 09:06:02 -0400
commit84ae10ad68c7b253ab87558c5a6df057c9a84f08 (patch)
tree45fa610034cd74b239f177b3d0b825aee23364d0
parent9021b64806f80d051c135760a56c8cc5994063ce (diff)
parent7d627dd3365d6907aef771e20d1cca68da29402a (diff)
downloadmeta-amd-dizzy.tar.gz
meta-amd-dizzy.tar.bz2
meta-amd-dizzy.zip
Merge pull request #197 from drewmoseley/dizzydizzy
Merge latest bits from release/2014.12
-rw-r--r--common/recipes-core/initrdscripts/files/0012-init-install.sh-drop-all-automount-rules-whil.patch31
-rw-r--r--common/recipes-core/initrdscripts/files/0013-init-install-efi.sh-drop-all-automount-rules-whil.patch31
-rw-r--r--common/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bbappend1
-rw-r--r--common/recipes-core/initrdscripts/initramfs-live-install_1.0.bbappend1
-rw-r--r--common/sourcery/recipes/meta/external-sourcery-toolchain.bbappend8
-rw-r--r--meta-amdfalconx86/recipes-kernel/amd-spi/kernel-module-amd-spi_1.0.bb2
6 files changed, 73 insertions, 1 deletions
diff --git a/common/recipes-core/initrdscripts/files/0012-init-install.sh-drop-all-automount-rules-whil.patch b/common/recipes-core/initrdscripts/files/0012-init-install.sh-drop-all-automount-rules-whil.patch
new file mode 100644
index 00000000..f593c2d6
--- /dev/null
+++ b/common/recipes-core/initrdscripts/files/0012-init-install.sh-drop-all-automount-rules-whil.patch
@@ -0,0 +1,31 @@
+From 88927b3293fe9829cc7a7b00ba1e5524a4337f45 Mon Sep 17 00:00:00 2001
+From: Awais Belal <awais_belal@mentor.com>
+Date: Thu, 8 Oct 2015 18:44:27 +0500
+Subject: [PATCH] initramfs-live-install: drop all automount rules while
+ installing
+
+Different auto mount rules reside under /etc/udev/rules.d and
+can cause trouble while installing on devices like mmc as
+these get auto mounted and the installer script fails
+to format them.
+
+Signed-off-by: Awais Belal <awais_belal@mentor.com>
+---
+ init-install.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/init-install.sh b/init-install.sh
+index aa17b5f..c9a3534 100644
+--- init-install.sh
++++ init-install.sh
+@@ -111,6 +111,7 @@ device=$TARGET_DEVICE_NAME
+ #
+ rm -f /etc/udev/rules.d/automount.rules
+ rm -f /etc/udev/scripts/mount*
++rm -f /etc/udev/rules.d/*auto-mount.rules
+
+ #
+ # Unmount anything the automounter had mounted
+--
+1.9.1
+
diff --git a/common/recipes-core/initrdscripts/files/0013-init-install-efi.sh-drop-all-automount-rules-whil.patch b/common/recipes-core/initrdscripts/files/0013-init-install-efi.sh-drop-all-automount-rules-whil.patch
new file mode 100644
index 00000000..4ce75482
--- /dev/null
+++ b/common/recipes-core/initrdscripts/files/0013-init-install-efi.sh-drop-all-automount-rules-whil.patch
@@ -0,0 +1,31 @@
+From ce5f89f08c7c929cd6d9e9b6ee065a83294e5388 Mon Sep 17 00:00:00 2001
+From: Awais Belal <awais_belal@mentor.com>
+Date: Thu, 8 Oct 2015 18:50:11 +0500
+Subject: [PATCH] initramfs-live-install-efi: drop all automount rules while
+ installing
+
+Different auto mount rules reside under /etc/udev/rules.d and
+can cause trouble while installing on devices like mmc as
+these get auto mounted and the installer script fails
+to format them.
+
+Signed-off-by: Awais Belal <awais_belal@mentor.com>
+---
+ init-install-efi.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/init-install-efi.sh b/init-install-efi.sh
+index 4759786..3597ab1 100644
+--- init-install-efi.sh
++++ init-install-efi.sh
+@@ -113,6 +113,7 @@ device=$TARGET_DEVICE_NAME
+ #
+ rm -f /etc/udev/rules.d/automount.rules
+ rm -f /etc/udev/scripts/mount*
++rm -f /etc/udev/rules.d/*auto-mount.rules
+
+ #
+ # Unmount anything the automounter had mounted
+--
+1.9.1
+
diff --git a/common/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bbappend b/common/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bbappend
index 604b73bf..afa20d41 100644
--- a/common/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bbappend
+++ b/common/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bbappend
@@ -5,4 +5,5 @@ SRC_URI_append_amd = " \
file://0006-init-install-efi.sh-Switch-to-using-static-device-pa.patch;striplevel=0;patchdir=${WORKDIR} \
file://0009-init-install-efi.sh-uniquely-identify-boot-device.patch;striplevel=0;patchdir=${WORKDIR} \
file://0010-init-install-efi.sh-handle-mmc-device-as-installation-media.patch;striplevel=0;patchdir=${WORKDIR} \
+ file://0013-init-install-efi.sh-drop-all-automount-rules-whil.patch;striplevel=0;patchdir=${WORKDIR} \
"
diff --git a/common/recipes-core/initrdscripts/initramfs-live-install_1.0.bbappend b/common/recipes-core/initrdscripts/initramfs-live-install_1.0.bbappend
index 76701abe..65aa87b3 100644
--- a/common/recipes-core/initrdscripts/initramfs-live-install_1.0.bbappend
+++ b/common/recipes-core/initrdscripts/initramfs-live-install_1.0.bbappend
@@ -6,4 +6,5 @@ SRC_URI_append_amd = " \
file://0007-init-install.sh-Add-extra-sync-time.patch;striplevel=0;patchdir=${WORKDIR} \
file://0008-init-install.sh-uniquely-identify-boot-device.patch;striplevel=0;patchdir=${WORKDIR} \
file://0011-init-install.sh-handle-mmc-device-as-installation-media.patch;striplevel=0;patchdir=${WORKDIR} \
+ file://0012-init-install.sh-drop-all-automount-rules-whil.patch;striplevel=0;patchdir=${WORKDIR} \
"
diff --git a/common/sourcery/recipes/meta/external-sourcery-toolchain.bbappend b/common/sourcery/recipes/meta/external-sourcery-toolchain.bbappend
new file mode 100644
index 00000000..ebfd8ac6
--- /dev/null
+++ b/common/sourcery/recipes/meta/external-sourcery-toolchain.bbappend
@@ -0,0 +1,8 @@
+# This is a strict hack for CB version 2014.11-101
+# the debugger points to /usr/lib6464 rather than
+# to /usr/lib64 so we create a symlink to work around
+# the issue for the time being
+do_install_append_amd() {
+ ln -s ${libdir} ${D}/${libdir}64
+}
+FILES_gdbserver_append_amd = " ${libdir}64 "
diff --git a/meta-amdfalconx86/recipes-kernel/amd-spi/kernel-module-amd-spi_1.0.bb b/meta-amdfalconx86/recipes-kernel/amd-spi/kernel-module-amd-spi_1.0.bb
index b0cdc4f0..e509b358 100644
--- a/meta-amdfalconx86/recipes-kernel/amd-spi/kernel-module-amd-spi_1.0.bb
+++ b/meta-amdfalconx86/recipes-kernel/amd-spi/kernel-module-amd-spi_1.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "This kernel module provides support for AMD SPI controller driver
LICENSE = "BSD | GPLv2"
LIC_FILES_CHKSUM = "file://spi_amd.c;md5=80f01f3b969d0b1d633df6ba9edf4170 \
file://spi_amd.h;md5=488f986ada9e64f6b5ee6d55c269ae1b \
- file://spirom.c;md5=ec2142faf7c64a85563fcaa129772fc0 \
+ file://spirom.c;md5=bca38ac88c0c595e6904eefa25d28f16 \
file://spirom.h;md5=8de0c535224dbd8ecd2f40ef29c15d0a \
file://Makefile;md5=8ea80a6d4ae15bcf922d090df6cfdd4c \
"