All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-virtualization][PATCH 1/2] dev86: upgrade to 0.16.21 and fix SRC_URI
@ 2021-04-04  9:25 Martin Jansa
  2021-04-04  9:25 ` [meta-virtualization][PATCH 2/2] dev86: fix ldflags QA issue by passing LDFLAGS Martin Jansa
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Martin Jansa @ 2021-04-04  9:25 UTC (permalink / raw)
  To: meta-virtualization; +Cc: Martin Jansa

* don't use github archives
* upgrade to fix build with security-flags.inc enabled, fixed upstream in:
  https://github.com/lkundrak/dev86/commit/537e806f8c62b26c5d5fa912f383f4a7d558574d

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../dev86/{dev86_0.16.20.bb => dev86_0.16.21.bb}         | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
 rename recipes-extended/dev86/{dev86_0.16.20.bb => dev86_0.16.21.bb} (76%)

diff --git a/recipes-extended/dev86/dev86_0.16.20.bb b/recipes-extended/dev86/dev86_0.16.21.bb
similarity index 76%
rename from recipes-extended/dev86/dev86_0.16.20.bb
rename to recipes-extended/dev86/dev86_0.16.21.bb
index d93e487..d38f7bd 100644
--- a/recipes-extended/dev86/dev86_0.16.20.bb
+++ b/recipes-extended/dev86/dev86_0.16.21.bb
@@ -3,14 +3,11 @@ HOMEPAGE = "http://www.debath.co.uk/dev86/"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 SECTION = "console/tools"
-PR="r0"
 
-SRC_URI="https://github.com/lkundrak/dev86/archive/v${PV}.tar.gz"
+SRCREV = "c6f36cbafa979710b809f117562773dbd6825918"
+SRC_URI = "git://github.com/lkundrak/${BPN}.git;protocol=https"
 
-SRC_URI[md5sum] = "288af53f256300777efc91d97c082fda"
-SRC_URI[sha256sum] = "533f2a0d2ed61223040f27e5cd007a11d969aaf34f6b709ece122b1e6fc50580"
-
-S = "${WORKDIR}/dev86-${PV}"
+S = "${WORKDIR}/git"
 
 BBCLASSEXTEND = "native"
 EXTRA_OEMAKE = "VERSION=${PV} PREFIX=${prefix} DIST=${D}"
-- 
2.30.2


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [meta-virtualization][PATCH 2/2] dev86: fix ldflags QA issue by passing LDFLAGS
  2021-04-04  9:25 [meta-virtualization][PATCH 1/2] dev86: upgrade to 0.16.21 and fix SRC_URI Martin Jansa
@ 2021-04-04  9:25 ` Martin Jansa
  2021-04-07  0:36 ` [meta-virtualization][PATCH 1/2] dev86: upgrade to 0.16.21 and fix SRC_URI Bruce Ashfield
  2021-04-07  0:37 ` Bruce Ashfield
  2 siblings, 0 replies; 4+ messages in thread
From: Martin Jansa @ 2021-04-04  9:25 UTC (permalink / raw)
  To: meta-virtualization; +Cc: Martin Jansa

ERROR: dev86-0.16.21-r0 do_package_qa: QA Issue: File /usr/lib/bcc/unproto in package dev86 doesn't have GNU_HASH (didn't pass LDFLAGS?)
File /usr/lib/bcc/bcc-cpp in package dev86 doesn't have GNU_HASH (didn't pass LDFLAGS?)
File /usr/lib/bcc/copt in package dev86 doesn't have GNU_HASH (didn't pass LDFLAGS?)
File /usr/lib/bcc/bcc-cc1 in package dev86 doesn't have GNU_HASH (didn't pass LDFLAGS?)
File /usr/bin/ld86 in package dev86 doesn't have GNU_HASH (didn't pass LDFLAGS?)
File /usr/bin/ar86 in package dev86 doesn't have GNU_HASH (didn't pass LDFLAGS?)
File /usr/bin/size86 in package dev86 doesn't have GNU_HASH (didn't pass LDFLAGS?)
File /usr/bin/nm86 in package dev86 doesn't have GNU_HASH (didn't pass LDFLAGS?)
File /usr/bin/as86 in package dev86 doesn't have GNU_HASH (didn't pass LDFLAGS?)
File /usr/bin/objdump86 in package dev86 doesn't have GNU_HASH (didn't pass LDFLAGS?)
File /usr/bin/bcc in package dev86 doesn't have GNU_HASH (didn't pass LDFLAGS?) [ldflags]
ERROR: dev86-0.16.21-r0 do_package_qa: QA run found fatal errors. Please consider fixing them.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 recipes-extended/dev86/dev86_0.16.21.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/recipes-extended/dev86/dev86_0.16.21.bb b/recipes-extended/dev86/dev86_0.16.21.bb
index d38f7bd..cf64a9d 100644
--- a/recipes-extended/dev86/dev86_0.16.21.bb
+++ b/recipes-extended/dev86/dev86_0.16.21.bb
@@ -10,10 +10,11 @@ SRC_URI = "git://github.com/lkundrak/${BPN}.git;protocol=https"
 S = "${WORKDIR}/git"
 
 BBCLASSEXTEND = "native"
-EXTRA_OEMAKE = "VERSION=${PV} PREFIX=${prefix} DIST=${D}"
+EXTRA_OEMAKE = "VERSION=${PV} PREFIX=${prefix} DIST=${D} LDFLAGS='${LDFLAGS}'"
 
 do_compile() {
-
+	# ${S}/Makefile does respect LDFLAGS, but ${S}/cpp/Makefile doesn't when building bcc-cpp
+	sed -i 's#$(CC) $(CFLAGS) -o bcc-cpp#$(CC) $(CFLAGS) $(LDFLAGS) -o bcc-cpp#g' ${S}/cpp/Makefile
 	oe_runmake make.fil
 	oe_runmake -f make.fil bcc86 as86 ld86
 
-- 
2.30.2


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [meta-virtualization][PATCH 1/2] dev86: upgrade to 0.16.21 and fix SRC_URI
  2021-04-04  9:25 [meta-virtualization][PATCH 1/2] dev86: upgrade to 0.16.21 and fix SRC_URI Martin Jansa
  2021-04-04  9:25 ` [meta-virtualization][PATCH 2/2] dev86: fix ldflags QA issue by passing LDFLAGS Martin Jansa
@ 2021-04-07  0:36 ` Bruce Ashfield
  2021-04-07  0:37 ` Bruce Ashfield
  2 siblings, 0 replies; 4+ messages in thread
From: Bruce Ashfield @ 2021-04-07  0:36 UTC (permalink / raw)
  To: Martin Jansa; +Cc: meta-virtualization

merged

Bruce

In message: [meta-virtualization][PATCH 1/2] dev86: upgrade to 0.16.21 and fix SRC_URI
on 04/04/2021 Martin Jansa wrote:

> * don't use github archives
> * upgrade to fix build with security-flags.inc enabled, fixed upstream in:
>   https://github.com/lkundrak/dev86/commit/537e806f8c62b26c5d5fa912f383f4a7d558574d
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  .../dev86/{dev86_0.16.20.bb => dev86_0.16.21.bb}         | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
>  rename recipes-extended/dev86/{dev86_0.16.20.bb => dev86_0.16.21.bb} (76%)
> 
> diff --git a/recipes-extended/dev86/dev86_0.16.20.bb b/recipes-extended/dev86/dev86_0.16.21.bb
> similarity index 76%
> rename from recipes-extended/dev86/dev86_0.16.20.bb
> rename to recipes-extended/dev86/dev86_0.16.21.bb
> index d93e487..d38f7bd 100644
> --- a/recipes-extended/dev86/dev86_0.16.20.bb
> +++ b/recipes-extended/dev86/dev86_0.16.21.bb
> @@ -3,14 +3,11 @@ HOMEPAGE = "http://www.debath.co.uk/dev86/"
>  LICENSE = "GPLv2"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
>  SECTION = "console/tools"
> -PR="r0"
>  
> -SRC_URI="https://github.com/lkundrak/dev86/archive/v${PV}.tar.gz"
> +SRCREV = "c6f36cbafa979710b809f117562773dbd6825918"
> +SRC_URI = "git://github.com/lkundrak/${BPN}.git;protocol=https"
>  
> -SRC_URI[md5sum] = "288af53f256300777efc91d97c082fda"
> -SRC_URI[sha256sum] = "533f2a0d2ed61223040f27e5cd007a11d969aaf34f6b709ece122b1e6fc50580"
> -
> -S = "${WORKDIR}/dev86-${PV}"
> +S = "${WORKDIR}/git"
>  
>  BBCLASSEXTEND = "native"
>  EXTRA_OEMAKE = "VERSION=${PV} PREFIX=${prefix} DIST=${D}"
> -- 
> 2.30.2
> 

> 
> 
> 



^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [meta-virtualization][PATCH 1/2] dev86: upgrade to 0.16.21 and fix SRC_URI
  2021-04-04  9:25 [meta-virtualization][PATCH 1/2] dev86: upgrade to 0.16.21 and fix SRC_URI Martin Jansa
  2021-04-04  9:25 ` [meta-virtualization][PATCH 2/2] dev86: fix ldflags QA issue by passing LDFLAGS Martin Jansa
  2021-04-07  0:36 ` [meta-virtualization][PATCH 1/2] dev86: upgrade to 0.16.21 and fix SRC_URI Bruce Ashfield
@ 2021-04-07  0:37 ` Bruce Ashfield
  2 siblings, 0 replies; 4+ messages in thread
From: Bruce Ashfield @ 2021-04-07  0:37 UTC (permalink / raw)
  To: Martin Jansa; +Cc: meta-virtualization

This looks fine to me,

But I'll wait to get Christopher's Ack before pulling it in.

Bruce

In message: [meta-virtualization][PATCH 1/2] dev86: upgrade to 0.16.21 and fix SRC_URI
on 04/04/2021 Martin Jansa wrote:

> * don't use github archives
> * upgrade to fix build with security-flags.inc enabled, fixed upstream in:
>   https://github.com/lkundrak/dev86/commit/537e806f8c62b26c5d5fa912f383f4a7d558574d
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  .../dev86/{dev86_0.16.20.bb => dev86_0.16.21.bb}         | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
>  rename recipes-extended/dev86/{dev86_0.16.20.bb => dev86_0.16.21.bb} (76%)
> 
> diff --git a/recipes-extended/dev86/dev86_0.16.20.bb b/recipes-extended/dev86/dev86_0.16.21.bb
> similarity index 76%
> rename from recipes-extended/dev86/dev86_0.16.20.bb
> rename to recipes-extended/dev86/dev86_0.16.21.bb
> index d93e487..d38f7bd 100644
> --- a/recipes-extended/dev86/dev86_0.16.20.bb
> +++ b/recipes-extended/dev86/dev86_0.16.21.bb
> @@ -3,14 +3,11 @@ HOMEPAGE = "http://www.debath.co.uk/dev86/"
>  LICENSE = "GPLv2"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
>  SECTION = "console/tools"
> -PR="r0"
>  
> -SRC_URI="https://github.com/lkundrak/dev86/archive/v${PV}.tar.gz"
> +SRCREV = "c6f36cbafa979710b809f117562773dbd6825918"
> +SRC_URI = "git://github.com/lkundrak/${BPN}.git;protocol=https"
>  
> -SRC_URI[md5sum] = "288af53f256300777efc91d97c082fda"
> -SRC_URI[sha256sum] = "533f2a0d2ed61223040f27e5cd007a11d969aaf34f6b709ece122b1e6fc50580"
> -
> -S = "${WORKDIR}/dev86-${PV}"
> +S = "${WORKDIR}/git"
>  
>  BBCLASSEXTEND = "native"
>  EXTRA_OEMAKE = "VERSION=${PV} PREFIX=${prefix} DIST=${D}"
> -- 
> 2.30.2
> 

> 
> 
> 



^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-04-07  0:37 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-04  9:25 [meta-virtualization][PATCH 1/2] dev86: upgrade to 0.16.21 and fix SRC_URI Martin Jansa
2021-04-04  9:25 ` [meta-virtualization][PATCH 2/2] dev86: fix ldflags QA issue by passing LDFLAGS Martin Jansa
2021-04-07  0:36 ` [meta-virtualization][PATCH 1/2] dev86: upgrade to 0.16.21 and fix SRC_URI Bruce Ashfield
2021-04-07  0:37 ` Bruce Ashfield

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.