* [PATCH 0/1] A bugfix for grub recipe
@ 2014-08-15 19:48 nitin.a.kamble
2014-08-15 19:49 ` [PATCH 1/1] grub_2.00: strip the sparc64 files from building nitin.a.kamble
0 siblings, 1 reply; 4+ messages in thread
From: nitin.a.kamble @ 2014-08-15 19:48 UTC (permalink / raw)
To: Openembedded-core, richard.purdie, saul.wold
From: Nitin A Kamble <nitin.a.kamble@intel.com>
One of the bug reported for the grub-2 recipe is fixed in the following commit.
Thanks,
Nitin
The following changes since commit 093149d22461a3a76980635bc46cdba1c7c0b181:
avahi: unset FILES_avahi to avoid packaging files there (2014-08-15 18:21:54 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib nitin/misc
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=nitin/misc
Nitin A Kamble (1):
grub_2.00: strip the sparc64 files from building
...rub2-remove-sparc64-setup-from-x86-builds.patch | 104 +++++++++++++++++++++
meta/recipes-bsp/grub/grub_2.00.bb | 3 +-
2 files changed, 106 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-bsp/grub/grub-2.00/grub2-remove-sparc64-setup-from-x86-builds.patch
--
1.8.1.4
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/1] grub_2.00: strip the sparc64 files from building
2014-08-15 19:48 [PATCH 0/1] A bugfix for grub recipe nitin.a.kamble
@ 2014-08-15 19:49 ` nitin.a.kamble
2014-08-15 20:38 ` Saul Wold
0 siblings, 1 reply; 4+ messages in thread
From: nitin.a.kamble @ 2014-08-15 19:49 UTC (permalink / raw)
To: Openembedded-core, richard.purdie, saul.wold
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Avoid building and packaging of sparc64 specific files in the x86 builds.
Fixes Bug:
[YOCTO #6427]
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
...rub2-remove-sparc64-setup-from-x86-builds.patch | 104 +++++++++++++++++++++
meta/recipes-bsp/grub/grub_2.00.bb | 3 +-
2 files changed, 106 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-bsp/grub/grub-2.00/grub2-remove-sparc64-setup-from-x86-builds.patch
diff --git a/meta/recipes-bsp/grub/grub-2.00/grub2-remove-sparc64-setup-from-x86-builds.patch b/meta/recipes-bsp/grub/grub-2.00/grub2-remove-sparc64-setup-from-x86-builds.patch
new file mode 100644
index 0000000..6259a1a
--- /dev/null
+++ b/meta/recipes-bsp/grub/grub-2.00/grub2-remove-sparc64-setup-from-x86-builds.patch
@@ -0,0 +1,104 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+remove the grub-sparc64-setup files from the x86 builds.
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
+
+--- a/Makefile.util.am 2014-08-15 11:41:02.441011278 -0700
++++ b/Makefile.util.am 2014-08-15 11:44:26.245021142 -0700
+@@ -4692,9 +4692,9 @@
+ endif
+
+ if COND_emu
+-sbin_PROGRAMS += grub-sparc64-setup
++sbin_PROGRAMS +=
+ if COND_MAN_PAGES
+-man_MANS += grub-sparc64-setup.8
++man_MANS +=
+
+ grub-sparc64-setup.8: grub-sparc64-setup
+ chmod a+x grub-sparc64-setup
+@@ -4715,9 +4715,9 @@
+ endif
+
+ if COND_i386_pc
+-sbin_PROGRAMS += grub-sparc64-setup
++sbin_PROGRAMS +=
+ if COND_MAN_PAGES
+-man_MANS += grub-sparc64-setup.8
++man_MANS +=
+
+ grub-sparc64-setup.8: grub-sparc64-setup
+ chmod a+x grub-sparc64-setup
+@@ -4738,9 +4738,9 @@
+ endif
+
+ if COND_i386_efi
+-sbin_PROGRAMS += grub-sparc64-setup
++sbin_PROGRAMS +=
+ if COND_MAN_PAGES
+-man_MANS += grub-sparc64-setup.8
++man_MANS +=
+
+ grub-sparc64-setup.8: grub-sparc64-setup
+ chmod a+x grub-sparc64-setup
+@@ -4761,9 +4761,9 @@
+ endif
+
+ if COND_i386_qemu
+-sbin_PROGRAMS += grub-sparc64-setup
++sbin_PROGRAMS +=
+ if COND_MAN_PAGES
+-man_MANS += grub-sparc64-setup.8
++man_MANS +=
+
+ grub-sparc64-setup.8: grub-sparc64-setup
+ chmod a+x grub-sparc64-setup
+@@ -4784,9 +4784,9 @@
+ endif
+
+ if COND_i386_coreboot
+-sbin_PROGRAMS += grub-sparc64-setup
++sbin_PROGRAMS +=
+ if COND_MAN_PAGES
+-man_MANS += grub-sparc64-setup.8
++man_MANS +=
+
+ grub-sparc64-setup.8: grub-sparc64-setup
+ chmod a+x grub-sparc64-setup
+@@ -4807,9 +4807,9 @@
+ endif
+
+ if COND_i386_multiboot
+-sbin_PROGRAMS += grub-sparc64-setup
++sbin_PROGRAMS +=
+ if COND_MAN_PAGES
+-man_MANS += grub-sparc64-setup.8
++man_MANS +=
+
+ grub-sparc64-setup.8: grub-sparc64-setup
+ chmod a+x grub-sparc64-setup
+@@ -4830,9 +4830,9 @@
+ endif
+
+ if COND_i386_ieee1275
+-sbin_PROGRAMS += grub-sparc64-setup
++sbin_PROGRAMS +=
+ if COND_MAN_PAGES
+-man_MANS += grub-sparc64-setup.8
++man_MANS +=
+
+ grub-sparc64-setup.8: grub-sparc64-setup
+ chmod a+x grub-sparc64-setup
+@@ -4853,9 +4853,9 @@
+ endif
+
+ if COND_x86_64_efi
+-sbin_PROGRAMS += grub-sparc64-setup
++sbin_PROGRAMS +=
+ if COND_MAN_PAGES
+-man_MANS += grub-sparc64-setup.8
++man_MANS +=
+
+ grub-sparc64-setup.8: grub-sparc64-setup
+ chmod a+x grub-sparc64-setup
diff --git a/meta/recipes-bsp/grub/grub_2.00.bb b/meta/recipes-bsp/grub/grub_2.00.bb
index 3c1ec0b..ddc0722 100644
--- a/meta/recipes-bsp/grub/grub_2.00.bb
+++ b/meta/recipes-bsp/grub/grub_2.00.bb
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
DEPENDS = "autogen-native flex-native bison-native xz"
RDEPENDS_${PN} = "diffutils freetype"
-PR = "r1"
+PR = "r2"
SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
file://grub-install.in.patch \
@@ -23,6 +23,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
file://fix-issue-with-flex-2.5.37.patch \
file://grub-2.00-add-oe-kernel.patch \
file://fix-endianness-problem.patch \
+ file://grub2-remove-sparc64-setup-from-x86-builds.patch \
"
SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c"
--
1.8.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] grub_2.00: strip the sparc64 files from building
2014-08-15 19:49 ` [PATCH 1/1] grub_2.00: strip the sparc64 files from building nitin.a.kamble
@ 2014-08-15 20:38 ` Saul Wold
2014-08-15 22:29 ` Nitin A Kamble
0 siblings, 1 reply; 4+ messages in thread
From: Saul Wold @ 2014-08-15 20:38 UTC (permalink / raw)
To: nitin.a.kamble, Openembedded-core, richard.purdie
On 08/15/2014 12:49 PM, nitin.a.kamble@intel.com wrote:
> From: Nitin A Kamble <nitin.a.kamble@intel.com>
>
> Avoid building and packaging of sparc64 specific files in the x86 builds.
>
> Fixes Bug:
> [YOCTO #6427]
>
> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
> ---
> ...rub2-remove-sparc64-setup-from-x86-builds.patch | 104 +++++++++++++++++++++
> meta/recipes-bsp/grub/grub_2.00.bb | 3 +-
> 2 files changed, 106 insertions(+), 1 deletion(-)
> create mode 100644 meta/recipes-bsp/grub/grub-2.00/grub2-remove-sparc64-setup-from-x86-builds.patch
>
> diff --git a/meta/recipes-bsp/grub/grub-2.00/grub2-remove-sparc64-setup-from-x86-builds.patch b/meta/recipes-bsp/grub/grub-2.00/grub2-remove-sparc64-setup-from-x86-builds.patch
> new file mode 100644
> index 0000000..6259a1a
> --- /dev/null
> +++ b/meta/recipes-bsp/grub/grub-2.00/grub2-remove-sparc64-setup-from-x86-builds.patch
> @@ -0,0 +1,104 @@
> +Upstream-Status: Inappropriate [embedded specific]
> +
> +remove the grub-sparc64-setup files from the x86 builds.
> +
> +Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
> +
> +--- a/Makefile.util.am 2014-08-15 11:41:02.441011278 -0700
> ++++ b/Makefile.util.am 2014-08-15 11:44:26.245021142 -0700
> +@@ -4692,9 +4692,9 @@
> + endif
> +
> + if COND_emu
> +-sbin_PROGRAMS += grub-sparc64-setup
> ++sbin_PROGRAMS +=
> + if COND_MAN_PAGES
> +-man_MANS += grub-sparc64-setup.8
> ++man_MANS +=
> +
> + grub-sparc64-setup.8: grub-sparc64-setup
> + chmod a+x grub-sparc64-setup
> +@@ -4715,9 +4715,9 @@
> + endif
> +
> + if COND_i386_pc
> +-sbin_PROGRAMS += grub-sparc64-setup
> ++sbin_PROGRAMS +=
> + if COND_MAN_PAGES
> +-man_MANS += grub-sparc64-setup.8
> ++man_MANS +=
> +
> + grub-sparc64-setup.8: grub-sparc64-setup
> + chmod a+x grub-sparc64-setup
> +@@ -4738,9 +4738,9 @@
> + endif
> +
> + if COND_i386_efi
> +-sbin_PROGRAMS += grub-sparc64-setup
> ++sbin_PROGRAMS +=
> + if COND_MAN_PAGES
> +-man_MANS += grub-sparc64-setup.8
> ++man_MANS +=
> +
> + grub-sparc64-setup.8: grub-sparc64-setup
> + chmod a+x grub-sparc64-setup
> +@@ -4761,9 +4761,9 @@
> + endif
> +
> + if COND_i386_qemu
> +-sbin_PROGRAMS += grub-sparc64-setup
> ++sbin_PROGRAMS +=
> + if COND_MAN_PAGES
> +-man_MANS += grub-sparc64-setup.8
> ++man_MANS +=
> +
> + grub-sparc64-setup.8: grub-sparc64-setup
> + chmod a+x grub-sparc64-setup
> +@@ -4784,9 +4784,9 @@
> + endif
> +
> + if COND_i386_coreboot
> +-sbin_PROGRAMS += grub-sparc64-setup
> ++sbin_PROGRAMS +=
> + if COND_MAN_PAGES
> +-man_MANS += grub-sparc64-setup.8
> ++man_MANS +=
> +
> + grub-sparc64-setup.8: grub-sparc64-setup
> + chmod a+x grub-sparc64-setup
> +@@ -4807,9 +4807,9 @@
> + endif
> +
> + if COND_i386_multiboot
> +-sbin_PROGRAMS += grub-sparc64-setup
> ++sbin_PROGRAMS +=
> + if COND_MAN_PAGES
> +-man_MANS += grub-sparc64-setup.8
> ++man_MANS +=
> +
> + grub-sparc64-setup.8: grub-sparc64-setup
> + chmod a+x grub-sparc64-setup
> +@@ -4830,9 +4830,9 @@
> + endif
> +
> + if COND_i386_ieee1275
> +-sbin_PROGRAMS += grub-sparc64-setup
> ++sbin_PROGRAMS +=
> + if COND_MAN_PAGES
> +-man_MANS += grub-sparc64-setup.8
> ++man_MANS +=
> +
> + grub-sparc64-setup.8: grub-sparc64-setup
> + chmod a+x grub-sparc64-setup
> +@@ -4853,9 +4853,9 @@
> + endif
> +
> + if COND_x86_64_efi
> +-sbin_PROGRAMS += grub-sparc64-setup
> ++sbin_PROGRAMS +=
> + if COND_MAN_PAGES
> +-man_MANS += grub-sparc64-setup.8
> ++man_MANS +=
> +
> + grub-sparc64-setup.8: grub-sparc64-setup
> + chmod a+x grub-sparc64-setup
> diff --git a/meta/recipes-bsp/grub/grub_2.00.bb b/meta/recipes-bsp/grub/grub_2.00.bb
> index 3c1ec0b..ddc0722 100644
> --- a/meta/recipes-bsp/grub/grub_2.00.bb
> +++ b/meta/recipes-bsp/grub/grub_2.00.bb
> @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
>
> DEPENDS = "autogen-native flex-native bison-native xz"
> RDEPENDS_${PN} = "diffutils freetype"
> -PR = "r1"
> +PR = "r2"
>
You don't need the PR bump anymore, just leave it set to r1
Sau!
> SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
> file://grub-install.in.patch \
> @@ -23,6 +23,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
> file://fix-issue-with-flex-2.5.37.patch \
> file://grub-2.00-add-oe-kernel.patch \
> file://fix-endianness-problem.patch \
> + file://grub2-remove-sparc64-setup-from-x86-builds.patch \
> "
>
> SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c"
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] grub_2.00: strip the sparc64 files from building
2014-08-15 20:38 ` Saul Wold
@ 2014-08-15 22:29 ` Nitin A Kamble
0 siblings, 0 replies; 4+ messages in thread
From: Nitin A Kamble @ 2014-08-15 22:29 UTC (permalink / raw)
To: Saul Wold, Openembedded-core, richard.purdie
On 8/15/2014 1:38 PM, Saul Wold wrote:
>> -PR = "r1"
>> +PR = "r2"
>>
> You don't need the PR bump anymore, just leave it set to r1
>
> Sau!
>
OK, I have update the commit in the contrib branch with PR = r1.
Nitin
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-08-15 22:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-15 19:48 [PATCH 0/1] A bugfix for grub recipe nitin.a.kamble
2014-08-15 19:49 ` [PATCH 1/1] grub_2.00: strip the sparc64 files from building nitin.a.kamble
2014-08-15 20:38 ` Saul Wold
2014-08-15 22:29 ` Nitin A Kamble
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox