Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix fedora32 build #28

Conversation

stewartsmith
Copy link
Contributor

@stewartsmith stewartsmith commented May 13, 2020

Fix building op-build on Fedora 32.

Mostly backports from newer buildroot.

shenki and others added 7 commits May 13, 2020
Upstream now optionally supports a yaml output format, and support is
detected through pkg-config. It has not been added as a dependency but
could in the future if someone asks for it.

Patches applied upstream:

  - Kill bogus TYPE_BLOB marker type
  - checks: fix simple-bus compatible matching

New patch:

 - Makefile: Add EXTRA_CFLAGS variable

The new patch is required to correctly add buildroot's cflags. The
existing packaging was overwriting those set by the package's makefile,
which was breaking the yaml detection.

Signed-off-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit b2f4dc7)
Signed-off-by: Stewart Smith <stewart@flamingspork.com>
Remove 0002-Makefile-Add-EXTRA_CFLAGS-variable.patch which is now
applied upstream

Signed-off-by: Titouan Christophe <titouan.christophe@railnova.eu>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 1e55b66)
Signed-off-by: Stewart Smith <stewart@flamingspork.com>
This reverts commit 1e55b66.

This bump breaks the build of a number of defconfigs with errors like:

HOSTCC  scripts/dtc/libfdt/fdt_ro.o
scripts/dtc/libfdt/fdt_ro.c:92:10: error: redefinition of ‘fdt_get_max_phandle’
uint32_t fdt_get_max_phandle(const void *fdt)
^~~~~~~~~~~~~~~~~~~
In file included from scripts/dtc/libfdt/fdt_ro.c:54:
/work/beaglebone/host/include/libfdt.h:384:24: note: previous definition of ‘fdt_get_max_phandle’ was here

So revert it for 2019.11.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit b78eecb)
Signed-off-by: Stewart Smith <stewart@flamingspork.com>
Updated patch 1 to handle changed context.
Removed patch 2 which is now upstream.

The update allows QEMU's configure script to successfully detect libfdt.

Signed-off-by: Sam Bobroff <sbobroff@linux.ibm.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 870fc9b)
Signed-off-by: Stewart Smith <stewart@flamingspork.com>
When host compiler is gcc 10 (for example on Fedora 32), dtc 1.5.1
fail to build with the error:
/usr/bin/ld: dtc-parser.tab.o:(.bss+0x20): multiple definition of `yylloc'; dtc-lexer.lex.o:(.bss+0x0): first defined here
collect2: error: ld returned 1 exit status

dtc 1.6.0 fixes this issue in the commit:
https://git.kernel.org/pub/scm/utils/dtc/dtc.git/commit/?id=0e9225eb0dfec51def612b928d2f1836b092bc7e

Also adopt new spacing convention in .hash files (two spaces).

Signed-off-by: Julien Olivain <juju@cotds.org>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 198db47)
Signed-off-by: Stewart Smith <stewart@flamingspork.com>
Otherwise fails to build on Fedora 32

Signed-off-by: Stewart Smith <stewart@flamingspork.com>
Add upstream patch to fix squashfs-tools build failures because
of missing external declaration for fwriter_buffer and
bwriter_buffer.

Fixes:

  - http://autobuild.buildroot.net/results/6789b668898245926e0a3a3e7caf823dff515d71

  /usr/bin/ld: read_fs.o:(.bss+0x0): multiple definition of `fwriter_buffer'; mksquashfs.o:(.bss+0x400c90): first defined here
  /usr/bin/ld: read_fs.o:(.bss+0x8): multiple definition of `bwriter_buffer'; mksquashfs.o:(.bss+0x400c98): first defined here

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 8d7b714)
Signed-off-by: Stewart Smith <stewart@flamingspork.com>
@klauskiwi
Copy link
Member

@klauskiwi klauskiwi commented May 14, 2020

looks good to me, and FWIW, I tested it with the latest op-build on fedora32 container using witherspoon,garrison,zz,palmetto defconfigs and everything seems fine

@klauskiwi
Copy link
Member

@klauskiwi klauskiwi commented Jun 10, 2020

@shenki Joel any comments?

@shenki
Copy link
Member

@shenki shenki commented Jun 11, 2020

The changes look good. I am not sure how to do a normal fast forward merge with the github UI so I will merge these in and push the branch using the command line.

@shenki
Copy link
Member

@shenki shenki commented Jun 11, 2020

Thanks for the patches @stewartsmith. These are merged to the 2019.05-op-build branch as of 4a064c9.

@shenki shenki closed this Jun 11, 2020
@shenki
Copy link
Member

@shenki shenki commented Jun 11, 2020

Bump is here: open-power/op-build#3693

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants