summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormingli.yu@windriver.com <mingli.yu@windriver.com>2016-08-02 14:38:10 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-04 15:22:23 +0100
commit1f1ac9fbdac3d74f32e268fda547eb1d0e3c6266 (patch)
tree3426c49993d6be83375ff2337f79ccfa688d4736
parent37f1e0c154cf542dee2af143760730b53b749d61 (diff)
downloadpoky-1f1ac9fbdac3d74f32e268fda547eb1d0e3c6266.tar.gz
grub2.inc: run autogen.sh before configure
* When adding new source files from upstream the autogen.sh script needs to be run * Rework grub2-remove-sparc64-setup-from-x86-builds.patch to remove the grub-setup helper program grub-sparc64-setup in Makefile.util.def instead of the previous Makefile.util.am to avoid the update for Makefile.util.am in do_patch phase is overwritten by the autogen.sh in do_configure phase (From OE-Core rev: 949df030cf39e7f551302e1e6f86b0a270cd2181) Signed-off-by: Catalin Enache <catalin.enache@windriver.com> Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-bsp/grub/files/grub2-remove-sparc64-setup-from-x86-builds.patch140
-rw-r--r--meta/recipes-bsp/grub/grub2.inc4
-rw-r--r--meta/recipes-bsp/grub/grub_git.bb7
3 files changed, 43 insertions, 108 deletions
diff --git a/meta/recipes-bsp/grub/files/grub2-remove-sparc64-setup-from-x86-builds.patch b/meta/recipes-bsp/grub/files/grub2-remove-sparc64-setup-from-x86-builds.patch
index e15040d703..5168d3ca56 100644
--- a/meta/recipes-bsp/grub/files/grub2-remove-sparc64-setup-from-x86-builds.patch
+++ b/meta/recipes-bsp/grub/files/grub2-remove-sparc64-setup-from-x86-builds.patch
@@ -1,104 +1,44 @@
1Upstream-Status: Inappropriate [embedded specific] 1Subject: [PATCH] grub2: remove grub-sparc64-setup from x86 builds
2
3* remove the grub-sparc64-setup files from the x86 builds.
2 4
3remove the grub-sparc64-setup files from the x86 builds. 5Upstream-Status: Inappropriate [embedded specific]
4 6
5Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 7Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
8Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
9---
10 Makefile.util.def | 18 ------------------
11 1 file changed, 18 deletions(-)
12
13diff --git a/Makefile.util.def b/Makefile.util.def
14index b80187c..a670cf2 100644
15--- a/Makefile.util.def
16+++ b/Makefile.util.def
17@@ -321,24 +321,6 @@ program = {
18 };
19
20 program = {
21- name = grub-sparc64-setup;
22- installdir = sbin;
23- mansection = 8;
24- common = util/grub-setup.c;
25- common = util/lvm.c;
26- common = grub-core/kern/emu/argp_common.c;
27- common = grub-core/lib/reed_solomon.c;
28- common = util/ieee1275/ofpath.c;
29-
30- ldadd = libgrubmods.a;
31- ldadd = libgrubkern.a;
32- ldadd = libgrubgcry.a;
33- ldadd = grub-core/gnulib/libgnu.a;
34- ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
35- cppflags = '-DGRUB_SETUP_SPARC64=1';
36-};
37-
38-program = {
39 name = grub-ofpathname;
40 installdir = sbin;
41 mansection = 8;
42--
432.8.1
6 44
7--- a/Makefile.util.am 2014-08-15 11:41:02.441011278 -0700
8+++ b/Makefile.util.am 2014-08-15 11:44:26.245021142 -0700
9@@ -4692,9 +4692,9 @@
10 endif
11
12 if COND_emu
13-sbin_PROGRAMS += grub-sparc64-setup
14+sbin_PROGRAMS +=
15 if COND_MAN_PAGES
16-man_MANS += grub-sparc64-setup.8
17+man_MANS +=
18
19 grub-sparc64-setup.8: grub-sparc64-setup
20 chmod a+x grub-sparc64-setup
21@@ -4715,9 +4715,9 @@
22 endif
23
24 if COND_i386_pc
25-sbin_PROGRAMS += grub-sparc64-setup
26+sbin_PROGRAMS +=
27 if COND_MAN_PAGES
28-man_MANS += grub-sparc64-setup.8
29+man_MANS +=
30
31 grub-sparc64-setup.8: grub-sparc64-setup
32 chmod a+x grub-sparc64-setup
33@@ -4738,9 +4738,9 @@
34 endif
35
36 if COND_i386_efi
37-sbin_PROGRAMS += grub-sparc64-setup
38+sbin_PROGRAMS +=
39 if COND_MAN_PAGES
40-man_MANS += grub-sparc64-setup.8
41+man_MANS +=
42
43 grub-sparc64-setup.8: grub-sparc64-setup
44 chmod a+x grub-sparc64-setup
45@@ -4761,9 +4761,9 @@
46 endif
47
48 if COND_i386_qemu
49-sbin_PROGRAMS += grub-sparc64-setup
50+sbin_PROGRAMS +=
51 if COND_MAN_PAGES
52-man_MANS += grub-sparc64-setup.8
53+man_MANS +=
54
55 grub-sparc64-setup.8: grub-sparc64-setup
56 chmod a+x grub-sparc64-setup
57@@ -4784,9 +4784,9 @@
58 endif
59
60 if COND_i386_coreboot
61-sbin_PROGRAMS += grub-sparc64-setup
62+sbin_PROGRAMS +=
63 if COND_MAN_PAGES
64-man_MANS += grub-sparc64-setup.8
65+man_MANS +=
66
67 grub-sparc64-setup.8: grub-sparc64-setup
68 chmod a+x grub-sparc64-setup
69@@ -4807,9 +4807,9 @@
70 endif
71
72 if COND_i386_multiboot
73-sbin_PROGRAMS += grub-sparc64-setup
74+sbin_PROGRAMS +=
75 if COND_MAN_PAGES
76-man_MANS += grub-sparc64-setup.8
77+man_MANS +=
78
79 grub-sparc64-setup.8: grub-sparc64-setup
80 chmod a+x grub-sparc64-setup
81@@ -4830,9 +4830,9 @@
82 endif
83
84 if COND_i386_ieee1275
85-sbin_PROGRAMS += grub-sparc64-setup
86+sbin_PROGRAMS +=
87 if COND_MAN_PAGES
88-man_MANS += grub-sparc64-setup.8
89+man_MANS +=
90
91 grub-sparc64-setup.8: grub-sparc64-setup
92 chmod a+x grub-sparc64-setup
93@@ -4853,9 +4853,9 @@
94 endif
95
96 if COND_x86_64_efi
97-sbin_PROGRAMS += grub-sparc64-setup
98+sbin_PROGRAMS +=
99 if COND_MAN_PAGES
100-man_MANS += grub-sparc64-setup.8
101+man_MANS +=
102
103 grub-sparc64-setup.8: grub-sparc64-setup
104 chmod a+x grub-sparc64-setup
diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc
index 0b169bfbea..d77a0d4fd9 100644
--- a/meta/recipes-bsp/grub/grub2.inc
+++ b/meta/recipes-bsp/grub/grub2.inc
@@ -33,7 +33,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
33 file://0001-grub-core-gettext-gettext.c-main_context-secondary_c.patch \ 33 file://0001-grub-core-gettext-gettext.c-main_context-secondary_c.patch \
34 " 34 "
35 35
36DEPENDS = "flex-native bison-native" 36DEPENDS = "flex-native bison-native autogen-native"
37 37
38SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" 38SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c"
39SRC_URI[sha256sum] = "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3" 39SRC_URI[sha256sum] = "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3"
@@ -60,6 +60,8 @@ do_configure_prepend() {
60 # for its own purposes. Remove the OE versions from the environment to 60 # for its own purposes. Remove the OE versions from the environment to
61 # avoid conflicts. 61 # avoid conflicts.
62 unset TARGET_CPPFLAGS TARGET_CFLAGS TARGET_CXXFLAGS TARGET_LDFLAGS 62 unset TARGET_CPPFLAGS TARGET_CFLAGS TARGET_CXXFLAGS TARGET_LDFLAGS
63 ( cd ${S}
64 ${S}/autogen.sh )
63} 65}
64 66
65# grub and grub-efi's sysroot/${datadir}/grub/grub-mkconfig_lib are 67# grub and grub-efi's sysroot/${datadir}/grub/grub-mkconfig_lib are
diff --git a/meta/recipes-bsp/grub/grub_git.bb b/meta/recipes-bsp/grub/grub_git.bb
index 7a900d02b2..493b6956ee 100644
--- a/meta/recipes-bsp/grub/grub_git.bb
+++ b/meta/recipes-bsp/grub/grub_git.bb
@@ -1,7 +1,5 @@
1require grub2.inc 1require grub2.inc
2 2
3DEPENDS += "autogen-native"
4
5DEFAULT_PREFERENCE = "-1" 3DEFAULT_PREFERENCE = "-1"
6DEFAULT_PREFERENCE_arm = "1" 4DEFAULT_PREFERENCE_arm = "1"
7 5
@@ -34,11 +32,6 @@ EXTRA_OECONF = "--with-platform=${GRUBPLATFORM} --disable-grub-mkfont --program-
34 32
35EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '--enable-largefile', '--disable-largefile', d)}" 33EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '--enable-largefile', '--disable-largefile', d)}"
36 34
37do_configure_prepend() {
38 ( cd ${S}
39 ${S}/autogen.sh )
40}
41
42do_install_append () { 35do_install_append () {
43 install -d ${D}${sysconfdir}/grub.d 36 install -d ${D}${sysconfdir}/grub.d
44 rm -rf ${D}${libdir}/charset.alias 37 rm -rf ${D}${libdir}/charset.alias