summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-devtools/qemu/qemu-1.2.0/remove-hardcoded-libexec.patch41
-rw-r--r--meta/recipes-devtools/qemu/qemu-git/remove-hardcoded-libexec.patch41
-rw-r--r--meta/recipes-devtools/qemu/qemu_1.2.0.bb3
3 files changed, 84 insertions, 1 deletions
diff --git a/meta/recipes-devtools/qemu/qemu-1.2.0/remove-hardcoded-libexec.patch b/meta/recipes-devtools/qemu/qemu-1.2.0/remove-hardcoded-libexec.patch
new file mode 100644
index 0000000000..8db460a5f6
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu-1.2.0/remove-hardcoded-libexec.patch
@@ -0,0 +1,41 @@
1This will allow the libexecdir to be set on the command line
2and have the files installed and used from the correct location
3
4Upstream-Status: Inappropriate [oe-core specific]
5
6Signed-off-by: Saul Wold <sgw@linux.intel.com>
7
8Index: qemu-1.2.0/configure
9===================================================================
10--- qemu-1.2.0.orig/configure
11+++ qemu-1.2.0/configure
12@@ -183,6 +183,7 @@ datadir="\${prefix}/share"
13 qemu_docdir="\${prefix}/share/doc/qemu"
14 bindir="\${prefix}/bin"
15 libdir="\${prefix}/lib"
16+libexecdir="\${prefix}/libexec"
17 includedir="\${prefix}/include"
18 sysconfdir="\${prefix}/etc"
19 confsuffix="/qemu"
20@@ -644,7 +645,9 @@ for opt do
21 ;;
22 --sysconfdir=*) sysconfdir="$optarg"
23 ;;
24- --sbindir=*|--libexecdir=*|--sharedstatedir=*|--localstatedir=*|\
25+ --libexecdir=*) libexecdir="$optarg"
26+ ;;
27+ --sbindir=*|--sharedstatedir=*|--localstatedir=*|\
28 --oldincludedir=*|--datarootdir=*|--infodir=*|--localedir=*|\
29 --htmldir=*|--dvidir=*|--pdfdir=*|--psdir=*)
30 # These switches are silently ignored, for compatibility with
31@@ -3190,8 +3193,8 @@ echo "sysconfdir=$sysconfdir" >> $config
32 echo "qemu_confdir=$qemu_confdir" >> $config_host_mak
33 echo "qemu_datadir=$qemu_datadir" >> $config_host_mak
34 echo "qemu_docdir=$qemu_docdir" >> $config_host_mak
35-echo "libexecdir=\${prefix}/libexec" >> $config_host_mak
36-echo "CONFIG_QEMU_HELPERDIR=\"$prefix/libexec\"" >> $config_host_mak
37+echo "libexecdir=$libexecdir" >> $config_host_mak
38+echo "CONFIG_QEMU_HELPERDIR=\"$libexecdir\"" >> $config_host_mak
39
40 echo "ARCH=$ARCH" >> $config_host_mak
41 if test "$debug_tcg" = "yes" ; then
diff --git a/meta/recipes-devtools/qemu/qemu-git/remove-hardcoded-libexec.patch b/meta/recipes-devtools/qemu/qemu-git/remove-hardcoded-libexec.patch
new file mode 100644
index 0000000000..83f5463aad
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu-git/remove-hardcoded-libexec.patch
@@ -0,0 +1,41 @@
1This will allow the libexecdir to be set on the command line
2and have the files installed and used from the correct location
3
4Upstream-Status: Inappropriate [oe-core specific]
5
6Signed-off-by: Saul Wold <sgw@linux.intel.com>
7
8Index: qemu-1.2.0/configure
9===================================================================
10--- qemu-1.2.0.orig/configure
11+++ qemu-1.2.0/configure
12@@ -183,6 +183,7 @@ datadir="\${prefix}/share"
13 qemu_docdir="\${prefix}/share/doc/qemu"
14 bindir="\${prefix}/bin"
15 libdir="\${prefix}/lib"
16+libexecdir="\${prefix}/libexec"
17 includedir="\${prefix}/include"
18 sysconfdir="\${prefix}/etc"
19 confsuffix="/qemu"
20@@ -644,7 +645,9 @@ for opt do
21 ;;
22 --sysconfdir=*) sysconfdir="$optarg"
23 ;;
24- --sbindir=*|--libexecdir=*|--sharedstatedir=*|--localstatedir=*|\
25+ --libexecdir=*) libexecdir="$optarg"
26+ ;;
27+ --sbindir=*|--sharedstatedir=*|--localstatedir=*|\
28 --oldincludedir=*|--datarootdir=*|--infodir=*|--localedir=*|\
29 --htmldir=*|--dvidir=*|--pdfdir=*|--psdir=*)
30 # These switches are silently ignored, for compatibility with
31@@ -3190,8 +3193,8 @@ echo "sysconfdir=$sysconfdir" >> $config
32 echo "qemu_confdir=$qemu_confdir" >> $config_host_mak
33 echo "qemu_datadir=$qemu_datadir" >> $config_host_mak
34 echo "qemu_docdir=$qemu_docdir" >> $config_host_mak
35-echo "libexecdir=\${prefix}/libexec" >> $config_host_mak
36-echo "CONFIG_QEMU_HELPERDIR=\"$prefix/libexec\"" >> $config_host_mak
37+echo "libexecdir=$libexecdir" >> $config_host_mak
38+echo "CONFIG_QEMU_HELPERDIR=$libexecdir" >> $config_host_mak
39
40 echo "ARCH=$ARCH" >> $config_host_mak
41 if test "$debug_tcg" = "yes" ; then
diff --git a/meta/recipes-devtools/qemu/qemu_1.2.0.bb b/meta/recipes-devtools/qemu/qemu_1.2.0.bb
index 517a74b05e..5cc142a624 100644
--- a/meta/recipes-devtools/qemu/qemu_1.2.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_1.2.0.bb
@@ -13,11 +13,12 @@ SRC_URI = "\
13 file://fallback-to-safe-mmap_min_addr.patch \ 13 file://fallback-to-safe-mmap_min_addr.patch \
14 file://larger_default_ram_size.patch \ 14 file://larger_default_ram_size.patch \
15 file://arm-bgr.patch \ 15 file://arm-bgr.patch \
16 file://remove-hardcoded-libexec.patch \
16 " 17 "
17SRC_URI[md5sum] = "78eb1e984f4532aa9f2bdd3c127b5b61" 18SRC_URI[md5sum] = "78eb1e984f4532aa9f2bdd3c127b5b61"
18SRC_URI[sha256sum] = "c8b84420d9f4869397f84cad2dabd9a475b7723d619a924a873740353e9df936" 19SRC_URI[sha256sum] = "c8b84420d9f4869397f84cad2dabd9a475b7723d619a924a873740353e9df936"
19 20
20PR = "r3" 21PR = "r4"
21 22
22SRC_URI_append_virtclass-nativesdk = "\ 23SRC_URI_append_virtclass-nativesdk = "\
23 file://relocatable_sdk.patch \ 24 file://relocatable_sdk.patch \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-13 12:07:07 +0000