[OE-core] [PATCH] xkbcomp: upgrade 1.4.2 -> 1.4.3
Signed-off-by: Zheng Ruoqin
---
.../xorg-app/{xkbcomp_1.4.2.bb => xkbcomp_1.4.3.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-app/{xkbcomp_1.4.2.bb => xkbcomp_1.4.3.bb}
(79%)
diff --git a/meta/recipes-graphics/xorg-app/xkbcomp_1.4.2.bb
b/meta/recipes-graphics/xorg-app/xkbcomp_1.4.3.bb
similarity index 79%
rename from meta/recipes-graphics/xorg-app/xkbcomp_1.4.2.bb
rename to meta/recipes-graphics/xorg-app/xkbcomp_1.4.3.bb
index ed1eed8662..2fa79c8438 100644
--- a/meta/recipes-graphics/xorg-app/xkbcomp_1.4.2.bb
+++ b/meta/recipes-graphics/xorg-app/xkbcomp_1.4.3.bb
@@ -15,5 +15,5 @@ BBCLASSEXTEND = "native"
EXTRA_OECONF += "--disable-selective-werror"
-SRC_URI[md5sum] = "12610df19df2af3797f2c130ee2bce97"
-SRC_URI[sha256sum] =
"6dd8bcb9be7e85bd7294abe261b8c7b0539d2fc93e41b80fb8bd013767ce8424"
+SRC_URI[md5sum] = "6e4751d99373f85d459ab4dff28893f5"
+SRC_URI[sha256sum] =
"06242c169fc11caf601cac46d781d467748c6a330e15b36dce46520b8ac8d435"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] tiff: Refresh patch
Refresh CVE-2019-7663.patch as it can't be applyed when using PATCHTOOL =
"patch".
Signed-off-by: Zheng Ruoqin
---
.../libtiff/tiff/CVE-2019-7663.patch | 71 --
1 file changed, 26 insertions(+), 45 deletions(-)
diff --git a/meta/recipes-multimedia/libtiff/tiff/CVE-2019-7663.patch
b/meta/recipes-multimedia/libtiff/tiff/CVE-2019-7663.patch
index f244fb2..94e4e33 100644
--- a/meta/recipes-multimedia/libtiff/tiff/CVE-2019-7663.patch
+++ b/meta/recipes-multimedia/libtiff/tiff/CVE-2019-7663.patch
@@ -1,22 +1,37 @@
-CVE: CVE-2019-7663
-Upstream-Status: Backport
-Signed-off-by: Ross Burton
+CVE: CVE-2019-7663
+Upstream-Status: Backport
+Signed-off-by:
+Ross Burton
From c6fc6c1fa895024c86285c58efd6424cf8078f32 Mon Sep 17 00:00:00 2001
From: Thomas Bernard
Date: Mon, 11 Feb 2019 10:05:33 +0100
Subject: [PATCH 1/2] check that (Tile Width)*(Samples/Pixel) do no overflow
-fixes bug 2833
+From da6454aa80b9bb3154dfab4e8b21637de47531e0 Mon Sep 17 00:00:00 2001
+From: Thomas Bernard
+Date: Mon, 11 Feb 2019 21:42:03 +0100
+Subject: [PATCH 2/2] tiffcp.c: use INT_MAX
+
+Signed-off-by: Zheng Ruoqin
+Refresh this patch as it can't be applyed when using PATCHTOOL = "patch".
---
- tools/tiffcp.c | 8 +++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
+ tools/tiffcp.c | 9 -
+ 1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/tools/tiffcp.c b/tools/tiffcp.c
-index 2f406e2d..f0ee2c02 100644
+index 2f406e2..8c81aa4 100644
--- a/tools/tiffcp.c
+++ b/tools/tiffcp.c
-@@ -1408,7 +1408,7 @@ DECLAREreadFunc(readSeparateTilesIntoBuffer)
+@@ -41,6 +41,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include
+
+@@ -1408,7 +1409,7 @@ DECLAREreadFunc(readSeparateTilesIntoBuffer)
int status = 1;
uint32 imagew = TIFFRasterScanlineSize(in);
uint32 tilew = TIFFTileRowSize(in);
@@ -25,11 +40,11 @@ index 2f406e2d..f0ee2c02 100644
tsize_t tilesize = TIFFTileSize(in);
tdata_t tilebuf;
uint8* bufp = (uint8*) buf;
-@@ -1416,6 +1416,12 @@ DECLAREreadFunc(readSeparateTilesIntoBuffer)
+@@ -1416,6 +1417,12 @@ DECLAREreadFunc(readSeparateTilesIntoBuffer)
uint32 row;
uint16 bps = 0, bytes_per_sample;
-+ if (spp > (0x7fff / tilew))
++ if (spp > (INT_MAX / tilew))
+ {
+ TIFFError(TIFFFileName(in), "Error, cannot handle that much
samples per tile row (Tile Width * Samples/Pixel)");
+ return 0;
@@ -39,39 +54,5 @@ index 2f406e2d..f0ee2c02 100644
if (tilebuf == 0)
return 0;
--
-2.20.1
-
-
-From da6454aa80b9bb3154dfab4e8b21637de47531e0 Mon Sep 17 00:00:00 2001
-From: Thomas Bernard
-Date: Mon, 11 Feb 2019 21:42:03 +0100
-Subject: [PATCH 2/2] tiffcp.c: use INT_MAX
-
- tools/tiffcp.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tools/tiffcp.c b/tools/tiffcp.c
-index f0ee2c02..8c81aa4f 100644
a/tools/tiffcp.c
-+++ b/tools/tiffcp.c
-@@ -41,6 +41,7 @@
- #include
- #include
- #include
-+#include
-
- #include
-
-@@ -1416,7 +1417,7 @@ DECLAREreadFunc(readSeparateTilesIntoBuffer)
- uint32 row;
- uint16 bps = 0, bytes_per_sample;
-
-- if (spp > (0x7fff / tilew))
-+ if (spp > (INT_MAX / tilew))
- {
- TIFFError(TIFFFileName(in), "Error, cannot handle that much
samples per tile row (Tile Width * Samples/Pixel)");
- return 0;
---
-2.20.1
+2.7.4
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [zeus][PATCH] tiff: Refresh patch
Refresh CVE-2019-7663.patch as it can't be applyed when using PATCHTOOL =
"patch".
Signed-off-by: Zheng Ruoqin
---
.../libtiff/tiff/CVE-2019-7663.patch | 71 --
1 file changed, 26 insertions(+), 45 deletions(-)
diff --git a/meta/recipes-multimedia/libtiff/tiff/CVE-2019-7663.patch
b/meta/recipes-multimedia/libtiff/tiff/CVE-2019-7663.patch
index f244fb2..94e4e33 100644
--- a/meta/recipes-multimedia/libtiff/tiff/CVE-2019-7663.patch
+++ b/meta/recipes-multimedia/libtiff/tiff/CVE-2019-7663.patch
@@ -1,22 +1,37 @@
-CVE: CVE-2019-7663
-Upstream-Status: Backport
-Signed-off-by: Ross Burton
+CVE: CVE-2019-7663
+Upstream-Status: Backport
+Signed-off-by:
+Ross Burton
From c6fc6c1fa895024c86285c58efd6424cf8078f32 Mon Sep 17 00:00:00 2001
From: Thomas Bernard
Date: Mon, 11 Feb 2019 10:05:33 +0100
Subject: [PATCH 1/2] check that (Tile Width)*(Samples/Pixel) do no overflow
-fixes bug 2833
+From da6454aa80b9bb3154dfab4e8b21637de47531e0 Mon Sep 17 00:00:00 2001
+From: Thomas Bernard
+Date: Mon, 11 Feb 2019 21:42:03 +0100
+Subject: [PATCH 2/2] tiffcp.c: use INT_MAX
+
+Signed-off-by: Zheng Ruoqin
+Refresh this patch as it can't be applyed when using PATCHTOOL = "patch".
---
- tools/tiffcp.c | 8 +++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
+ tools/tiffcp.c | 9 -
+ 1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/tools/tiffcp.c b/tools/tiffcp.c
-index 2f406e2d..f0ee2c02 100644
+index 2f406e2..8c81aa4 100644
--- a/tools/tiffcp.c
+++ b/tools/tiffcp.c
-@@ -1408,7 +1408,7 @@ DECLAREreadFunc(readSeparateTilesIntoBuffer)
+@@ -41,6 +41,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include
+
+@@ -1408,7 +1409,7 @@ DECLAREreadFunc(readSeparateTilesIntoBuffer)
int status = 1;
uint32 imagew = TIFFRasterScanlineSize(in);
uint32 tilew = TIFFTileRowSize(in);
@@ -25,11 +40,11 @@ index 2f406e2d..f0ee2c02 100644
tsize_t tilesize = TIFFTileSize(in);
tdata_t tilebuf;
uint8* bufp = (uint8*) buf;
-@@ -1416,6 +1416,12 @@ DECLAREreadFunc(readSeparateTilesIntoBuffer)
+@@ -1416,6 +1417,12 @@ DECLAREreadFunc(readSeparateTilesIntoBuffer)
uint32 row;
uint16 bps = 0, bytes_per_sample;
-+ if (spp > (0x7fff / tilew))
++ if (spp > (INT_MAX / tilew))
+ {
+ TIFFError(TIFFFileName(in), "Error, cannot handle that much
samples per tile row (Tile Width * Samples/Pixel)");
+ return 0;
@@ -39,39 +54,5 @@ index 2f406e2d..f0ee2c02 100644
if (tilebuf == 0)
return 0;
--
-2.20.1
-
-
-From da6454aa80b9bb3154dfab4e8b21637de47531e0 Mon Sep 17 00:00:00 2001
-From: Thomas Bernard
-Date: Mon, 11 Feb 2019 21:42:03 +0100
-Subject: [PATCH 2/2] tiffcp.c: use INT_MAX
-
- tools/tiffcp.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tools/tiffcp.c b/tools/tiffcp.c
-index f0ee2c02..8c81aa4f 100644
a/tools/tiffcp.c
-+++ b/tools/tiffcp.c
-@@ -41,6 +41,7 @@
- #include
- #include
- #include
-+#include
-
- #include
-
-@@ -1416,7 +1417,7 @@ DECLAREreadFunc(readSeparateTilesIntoBuffer)
- uint32 row;
- uint16 bps = 0, bytes_per_sample;
-
-- if (spp > (0x7fff / tilew))
-+ if (spp > (INT_MAX / tilew))
- {
- TIFFError(TIFFFileName(in), "Error, cannot handle that much
samples per tile row (Tile Width * Samples/Pixel)");
- return 0;
---
-2.20.1
+2.7.4
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libx11: Upgrade to 1.6.9
1) Upgrade libx11 from 1.6.8 to 1.6.9.
2) Delete patches for they have been meraged in new version.
no-host-libtool.patch
no-host-x.patch
Signed-off-by: Zheng Ruoqin
---
meta/recipes-graphics/xorg-lib/libx11.inc | 7 ++--
.../xorg-lib/libx11/no-host-libtool.patch | 45 --
.../xorg-lib/libx11/no-host-x.patch| 40 ---
.../xorg-lib/{libx11_1.6.8.bb => libx11_1.6.9.bb} | 0
4 files changed, 3 insertions(+), 89 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/no-host-libtool.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/no-host-x.patch
rename meta/recipes-graphics/xorg-lib/{libx11_1.6.8.bb => libx11_1.6.9.bb}
(100%)
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc
b/meta/recipes-graphics/xorg-lib/libx11.inc
index cce0cb9..d3cf5d9 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -11,11 +11,10 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/libx11:"
PE = "1"
SRC_URI += "file://Fix-hanging-issue-in-_XReply.patch \
-file://no-host-libtool.patch \
-file://no-host-x.patch"
+"
-SRC_URI[md5sum] = "c5fa5a86a20e3591bed6c046498d4b8f"
-SRC_URI[sha256sum] =
"b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5"
+SRC_URI[md5sum] = "55adbfb6d4370ecac5e70598c4e7eed2"
+SRC_URI[sha256sum] =
"9cc7e8d000d6193fa5af580d50d689380b8287052270f5bb26a5fb6b58b2bed1"
PROVIDES = "virtual/libx11"
diff --git a/meta/recipes-graphics/xorg-lib/libx11/no-host-libtool.patch
b/meta/recipes-graphics/xorg-lib/libx11/no-host-libtool.patch
deleted file mode 100644
index 56d9983..000
--- a/meta/recipes-graphics/xorg-lib/libx11/no-host-libtool.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Upstream-Status: Backport
[https://gitlab.freedesktop.org/xorg/lib/libx11/merge_requests/22]
-Signed-off-by: Ross Burton
-
-From edc7680ed5a03cedb5facf14693823455e12c29c Mon Sep 17 00:00:00 2001
-From: Ross Burton
-Date: Tue, 6 Aug 2019 14:53:43 +0100
-Subject: [PATCH libX11] src/util/Makefile: explicitly reset LINK to not use
- libtool
-
-Simply looking at libtool redefines LINK globally to use libtool, which when
-you're trying to cross-compile to Windows can cause complications.
-
-As in src/util/ we're simply building a small binary for the build host, reset
-LINK to the automake default so that the traditional compile/link steps occur
-without libtool.
-
-Also remove -all-static from LDFLAGS as that is a libtool-specific argument
-intended to solve this problem.
-
-Closes: #100
-Signed-off-by: Ross Burton
- src/util/Makefile.am | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/util/Makefile.am b/src/util/Makefile.am
-index 37314370..b7236530 100644
a/src/util/Makefile.am
-+++ b/src/util/Makefile.am
-@@ -7,10 +7,11 @@ AM_CFLAGS = \
- AM_CPPFLAGS = \
- -I$(top_srcdir)/include
-
-+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- CC = @CC_FOR_BUILD@
- CPPFLAGS = @CPPFLAGS_FOR_BUILD@
- CFLAGS = @CFLAGS_FOR_BUILD@
--LDFLAGS = @LDFLAGS_FOR_BUILD@ -all-static
-+LDFLAGS = @LDFLAGS_FOR_BUILD@
- LIBS =
- EXEEXT = @EXEEXT_FOR_BUILD@
-
---
-2.20.1
-
diff --git a/meta/recipes-graphics/xorg-lib/libx11/no-host-x.patch
b/meta/recipes-graphics/xorg-lib/libx11/no-host-x.patch
deleted file mode 100644
index 803f8b4..000
--- a/meta/recipes-graphics/xorg-lib/libx11/no-host-x.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Ross Burton
-
-From cf2ef27831173c5ed6f98be3c39caff18fd4e7f1 Mon Sep 17 00:00:00 2001
-From: Adam Jackson
-Date: Mon, 17 Jun 2019 13:36:08 -0400
-Subject: [PATCH 1/2] makekeys: Detach ourselves from X headers entirely
-
-Subsequent to a121b7b0c210efe10bf93453b29050282324c906 we are no longer
-building makekeys with enough -I/foo/bar to find the X11 headers, so if
-they're not in a system include path, things fail. Since this utility is
-only needed at build time, there's no real reason to demand the X
-headers be installed for both the build and target machines if cross-
-compiling, we can just assume a vaguely ANSI environment instead.
-
-Tested-by: Niclas Zeising
-Reviewed-by: Keith Packard
-Reviewed-by: Matt Turner
- src/util/makekeys.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/util/makekeys.c b/src/util/makekeys.c
-index bcb5b7d5..07563315 100644
a/src/util/makekeys.c
-+++ b/src/util/makekeys.c
-@@ -35,8 +35,10 @@ from The Open Group.
- #include
- #include
- #include
-+#include
-+#include
-
--#include "../Xresinternal.h"
-+typedef uint32_t Signature;
-
- #define KTNUM 4000
-
---
-2.20.1
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.8.bb
b/meta/recipes-graphics/xorg-lib/libx11_1.6.9.bb
similarity index 100%
rename from meta/recipes
Re: [OE-core] [PATCH v4] rpm: make rpm work in toolchain.
Hi Richard
>
> This is heading in the right direction but this patch still makes the
> nativesdk-rpm recipe machine specific and we can't do that.
>
If machine specific is not allowed, when user want to use rpm in nativesdk
environment, how should we get the corresponding arch info?
Do you have any suggestion about it?
--
------
Zheng Ruoqin
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
ADDR.: No.6 Wenzhu Road, Software Avenue,
Nanjing, 210012, China
MAIL : zhengrq.f...@cn.fujistu.com
> -Original Message-
> From: openembedded-core-boun...@lists.openembedded.org
> [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of
> Zheng, Ruoqin
> Sent: Monday, October 07, 2019 8:27 AM
> To: Richard Purdie ; openembedded-
> c...@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH v4] rpm: make rpm work in toolchain.
>
> Hi Richard
> >
> > This is heading in the right direction but this patch still makes the
> > nativesdk-rpm recipe machine specific and we can't do that.
> >
>
> In this patch, config file is same as v3 patch, and v3 patch has been
> accepted, but
> why this time is " makes the nativesdk-rpm recipe machine specific ".
>
> The config file is processed by script in post-relocate-setup.d/ the same as
> that in
> nativesdk-meson.
>
> --
> Zheng Ruoqin
> Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
> ADDR.: No.6 Wenzhu Road, Software Avenue,
>Nanjing, 210012, China
> MAIL : zhengrq.f...@cn.fujistu.com
>
>
> > -Original Message-----
> > From: Richard Purdie [mailto:richard.pur...@linuxfoundation.org]
> > Sent: Wednesday, October 02, 2019 4:49 PM
> > To: Zheng, Ruoqin/郑 若钦 ; openembedded-
> > c...@lists.openembedded.org
> > Subject: Re: [OE-core] [PATCH v4] rpm: make rpm work in toolchain.
> >
> > On Wed, 2019-09-25 at 07:45 +0800, Zheng Ruoqin wrote:
> > > We need to configure rpm to use package architecture from yocto
> > > build system.
> > >
> > > Install rpmrc and rpm/platform to ${SDKTARGETSYSROOT} because config
> > > file in host-sysroot as /opt/poky/2.7+snapshot/sysroots/x86_64-
> > > pokysdk-linux will be covered by another ARCH which result in
> > > previous config settings inefficacy.
> > >
> > > To resolve it, put config file in target-sysroot like
> > > /opt/poky/2.7+snapshot/sysroots/core2-64-poky-linux. As each ARCH
> > > has its own target-sysroot, config file will not be covered.
> > >
> > > Signed-off-by: Zheng Ruoqin
> > > ---
> > > meta/recipes-devtools/rpm/files/rpm-setup.py | 27
> > >
> > > meta/recipes-devtools/rpm/rpm_4.14.2.1.bb| 19 ++
> > > 2 files changed, 46 insertions(+)
> > > create mode 100644 meta/recipes-devtools/rpm/files/rpm-setup.py
> > >
> > > diff --git a/meta/recipes-devtools/rpm/files/rpm-setup.py
> > > b/meta/recipes-devtools/rpm/files/rpm-setup.py
> > > new file mode 100644
> > > index 00..b3e8a1198c
> > > --- /dev/null
> > > +++ b/meta/recipes-devtools/rpm/files/rpm-setup.py
> > > @@ -0,0 +1,27 @@
> > > +#!/usr/bin/env python3
> > > +
> > > +import os
> > > +import sys
> > > +import shutil
> > > +
> > > +try:
> > > +native_sysroot = os.environ['OECORE_NATIVE_SYSROOT']
> > > +sdktarget_sysroot = os.environ['SDKTARGETSYSROOT'] except
> > > +KeyError:
> > > +print("Not in environment setup, bailing")
> > > +sys.exit(1)
> > > +
> > > +target_etc_dir = os.path.join(sdktarget_sysroot, 'etc/rpm')
> > > +
> > > +if not os.path.exists(target_etc_dir):
> > > +os.makedirs(target_etc_dir)
> > > +
> > > +template_file = os.path.join(native_sysroot, 'usr/share/rpm/rpmrc')
> > > +cross_file = os.path.join(sdktarget_sysroot, 'etc/rpmrc')
> > > +shutil.copy(template_file, cross_file)
> > > +
> > > +template_file = os.path.join(native_sysroot,
> > > 'usr/share/rpm/platform')
> > > +cross_file = os.path.join(sdktarget_sysroot, 'etc/rpm/platform')
> > > +shutil.copy(template_file, cross_file)
> > > +
> > > +
> > > diff --git a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
> > > b/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
> > > index c37330eb4c..e1d1951d74 100644
> > > --- a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
> > > +++ b/meta/recipes-d
Re: [OE-core] [PATCH v4] rpm: make rpm work in toolchain.
Hi Richard
>
> This is heading in the right direction but this patch still makes the
> nativesdk-rpm
> recipe machine specific and we can't do that.
>
In this patch, config file is same as v3 patch, and v3 patch has been accepted,
but why this time is " makes the nativesdk-rpm recipe machine specific ".
The config file is processed by script in post-relocate-setup.d/ the same as
that in nativesdk-meson.
------
Zheng Ruoqin
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
ADDR.: No.6 Wenzhu Road, Software Avenue,
Nanjing, 210012, China
MAIL : zhengrq.f...@cn.fujistu.com
> -Original Message-
> From: Richard Purdie [mailto:richard.pur...@linuxfoundation.org]
> Sent: Wednesday, October 02, 2019 4:49 PM
> To: Zheng, Ruoqin/郑 若钦 ; openembedded-
> c...@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH v4] rpm: make rpm work in toolchain.
>
> On Wed, 2019-09-25 at 07:45 +0800, Zheng Ruoqin wrote:
> > We need to configure rpm to use package architecture from yocto build
> > system.
> >
> > Install rpmrc and rpm/platform to ${SDKTARGETSYSROOT} because config
> > file in host-sysroot as /opt/poky/2.7+snapshot/sysroots/x86_64-
> > pokysdk-linux will be covered by another ARCH which result in previous
> > config settings inefficacy.
> >
> > To resolve it, put config file in target-sysroot like
> > /opt/poky/2.7+snapshot/sysroots/core2-64-poky-linux. As each ARCH has
> > its own target-sysroot, config file will not be covered.
> >
> > Signed-off-by: Zheng Ruoqin
> > ---
> > meta/recipes-devtools/rpm/files/rpm-setup.py | 27
> >
> > meta/recipes-devtools/rpm/rpm_4.14.2.1.bb| 19 ++
> > 2 files changed, 46 insertions(+)
> > create mode 100644 meta/recipes-devtools/rpm/files/rpm-setup.py
> >
> > diff --git a/meta/recipes-devtools/rpm/files/rpm-setup.py
> > b/meta/recipes-devtools/rpm/files/rpm-setup.py
> > new file mode 100644
> > index 00..b3e8a1198c
> > --- /dev/null
> > +++ b/meta/recipes-devtools/rpm/files/rpm-setup.py
> > @@ -0,0 +1,27 @@
> > +#!/usr/bin/env python3
> > +
> > +import os
> > +import sys
> > +import shutil
> > +
> > +try:
> > +native_sysroot = os.environ['OECORE_NATIVE_SYSROOT']
> > +sdktarget_sysroot = os.environ['SDKTARGETSYSROOT'] except
> > +KeyError:
> > +print("Not in environment setup, bailing")
> > +sys.exit(1)
> > +
> > +target_etc_dir = os.path.join(sdktarget_sysroot, 'etc/rpm')
> > +
> > +if not os.path.exists(target_etc_dir):
> > +os.makedirs(target_etc_dir)
> > +
> > +template_file = os.path.join(native_sysroot, 'usr/share/rpm/rpmrc')
> > +cross_file = os.path.join(sdktarget_sysroot, 'etc/rpmrc')
> > +shutil.copy(template_file, cross_file)
> > +
> > +template_file = os.path.join(native_sysroot,
> > 'usr/share/rpm/platform')
> > +cross_file = os.path.join(sdktarget_sysroot, 'etc/rpm/platform')
> > +shutil.copy(template_file, cross_file)
> > +
> > +
> > diff --git a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
> > b/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
> > index c37330eb4c..e1d1951d74 100644
> > --- a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
> > +++ b/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
> > @@ -44,6 +44,9 @@ SRC_URI = "git://github.com/rpm-software-
> > management/rpm;branch=rpm-4.14.x \
> > file://0001-mono-find-provides-requires-do-not-use-
> > monodis-from-.patch \
> > "
> >
> > +SRC_URI_append_class-nativesdk = "file://rpm-setup.py \
> > + "
> > +
> > PE = "1"
> > SRCREV = "4a9440006398646583f0d9ae1837dad2875013aa"
> >
> > @@ -113,6 +116,20 @@ do_install_append_class-nativesdk() {
> > done
> >
> > rm -rf ${D}/var
> > +install -d ${D}${datadir}/rpm
> > +
> > +cat >${D}/${datadir}/rpm/rpmrc < > +arch_compat: ${MACHINE_ARCH}: all any noarch ${PACKAGE_EXTRA_ARCHS}
> > +EOF
> > +
> > +# Arch Info should be fixed as '-' is instead of '_'.
> > +sed -i 's/-/_/' ${D}${datadir}/rpm/rpmrc
> > +cat >${D}/${datadir}/rpm/platform < > +${MACHINE_ARCH}-pc-linux EOF
>
> This is heading in the right direction but this patch still makes the
> nativesdk-rpm
> recipe machine specific and we can't do that.
>
> Cheers,
>
> Richard
>
>
>
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] ✗ patchtest: failure for rpm: make rpm work in toolchain. (rev4)
ping -- Zheng Ruoqin Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) ADDR.: No.6 Wenzhu Road, Software Avenue, Nanjing, 210012, China MAIL : zhengrq.f...@cn.fujistu.com > -Original Message- > From: openembedded-core-boun...@lists.openembedded.org > [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of > Zheng, Ruoqin > Sent: Thursday, September 26, 2019 5:31 PM > To: openembedded-core@lists.openembedded.org > Subject: Re: [OE-core] ✗ patchtest: failure for rpm: make rpm work in > toolchain. > (rev4) > > Hi > > I found meta/recipes-devtools/rpm/files/rpm-setup.py is in my patch. > > But the automated test results have an error message as follows: > > Output Please, fix the listed issues: >meta/recipes-devtools/rpm/files/rpm-setup.py does not exist > > Does anyone have any suggestion? > > -- > Zheng Ruoqin > Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) > ADDR.: No.6 Wenzhu Road, Software Avenue, >Nanjing, 210012, China > MAIL : zhengrq.f...@cn.fujistu.com > > > -Original Message- > > From: Patchwork [mailto:patchw...@patchwork.openembedded.org] > > Sent: Wednesday, September 25, 2019 8:02 AM > > To: Zheng, Ruoqin/郑 若钦 > > Cc: openembedded-core@lists.openembedded.org > > Subject: ✗ patchtest: failure for rpm: make rpm work in toolchain. > > (rev4) > > > > == Series Details == > > > > Series: rpm: make rpm work in toolchain. (rev4) > > Revision: 4 > > URL : https://patchwork.openembedded.org/series/19789/ > > State : failure > > > > == Summary == > > > > > > Thank you for submitting this patch series to OpenEmbedded Core. This > > is an automated response. Several tests have been executed on the > > proposed series by patchtest resulting in the following failures: > > > > > > > > * Issue Errors in your Python code were encountered > > [test_pylint] > > Suggested fixCorrect the lines introduced by your patch > > Output Please, fix the listed issues: > >meta/recipes-devtools/rpm/files/rpm-setup.py does > > not exist > > > > > > > > If you believe any of these test results are incorrect, please reply > > to the mailing list (openembedded-core@lists.openembedded.org) raising your > concerns. > > Otherwise we would appreciate you correcting the issues and submitting > > a new version of the patchset if applicable. Please ensure you > > add/increment the version number when sending the new version (i.e. > > [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). > > > > --- > > Guidelines: > > https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines > > Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest > > Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe > > > > > > > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] ✗ patchtest: failure for rpm: make rpm work in toolchain. (rev4)
Hi I found meta/recipes-devtools/rpm/files/rpm-setup.py is in my patch. But the automated test results have an error message as follows: Output Please, fix the listed issues: meta/recipes-devtools/rpm/files/rpm-setup.py does not exist Does anyone have any suggestion? -- Zheng Ruoqin Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) ADDR.: No.6 Wenzhu Road, Software Avenue, Nanjing, 210012, China MAIL : zhengrq.f...@cn.fujistu.com > -Original Message- > From: Patchwork [mailto:patchw...@patchwork.openembedded.org] > Sent: Wednesday, September 25, 2019 8:02 AM > To: Zheng, Ruoqin/郑 若钦 > Cc: openembedded-core@lists.openembedded.org > Subject: ✗ patchtest: failure for rpm: make rpm work in toolchain. (rev4) > > == Series Details == > > Series: rpm: make rpm work in toolchain. (rev4) > Revision: 4 > URL : https://patchwork.openembedded.org/series/19789/ > State : failure > > == Summary == > > > Thank you for submitting this patch series to OpenEmbedded Core. This is an > automated response. Several tests have been executed on the proposed series > by patchtest resulting in the following failures: > > > > * Issue Errors in your Python code were encountered [test_pylint] > Suggested fixCorrect the lines introduced by your patch > Output Please, fix the listed issues: >meta/recipes-devtools/rpm/files/rpm-setup.py does not exist > > > > If you believe any of these test results are incorrect, please reply to the > mailing > list (openembedded-core@lists.openembedded.org) raising your concerns. > Otherwise we would appreciate you correcting the issues and submitting a new > version of the patchset if applicable. Please ensure you add/increment the > version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> > [PATCH v3] -> ...). > > --- > Guidelines: > https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines > Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest > Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4] rpm: make rpm work in toolchain.
We need to configure rpm to use package architecture from yocto build system.
Install rpmrc and rpm/platform to ${SDKTARGETSYSROOT} because config file in
host-sysroot as /opt/poky/2.7+snapshot/sysroots/x86_64-pokysdk-linux will be
covered by another ARCH which result in previous config settings inefficacy.
To resolve it, put config file in target-sysroot like
/opt/poky/2.7+snapshot/sysroots/core2-64-poky-linux. As each ARCH has its own
target-sysroot, config file will not be covered.
Signed-off-by: Zheng Ruoqin
---
meta/recipes-devtools/rpm/files/rpm-setup.py | 27
meta/recipes-devtools/rpm/rpm_4.14.2.1.bb| 19 ++
2 files changed, 46 insertions(+)
create mode 100644 meta/recipes-devtools/rpm/files/rpm-setup.py
diff --git a/meta/recipes-devtools/rpm/files/rpm-setup.py
b/meta/recipes-devtools/rpm/files/rpm-setup.py
new file mode 100644
index 00..b3e8a1198c
--- /dev/null
+++ b/meta/recipes-devtools/rpm/files/rpm-setup.py
@@ -0,0 +1,27 @@
+#!/usr/bin/env python3
+
+import os
+import sys
+import shutil
+
+try:
+native_sysroot = os.environ['OECORE_NATIVE_SYSROOT']
+sdktarget_sysroot = os.environ['SDKTARGETSYSROOT']
+except KeyError:
+print("Not in environment setup, bailing")
+sys.exit(1)
+
+target_etc_dir = os.path.join(sdktarget_sysroot, 'etc/rpm')
+
+if not os.path.exists(target_etc_dir):
+os.makedirs(target_etc_dir)
+
+template_file = os.path.join(native_sysroot, 'usr/share/rpm/rpmrc')
+cross_file = os.path.join(sdktarget_sysroot, 'etc/rpmrc')
+shutil.copy(template_file, cross_file)
+
+template_file = os.path.join(native_sysroot, 'usr/share/rpm/platform')
+cross_file = os.path.join(sdktarget_sysroot, 'etc/rpm/platform')
+shutil.copy(template_file, cross_file)
+
+
diff --git a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
b/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
index c37330eb4c..e1d1951d74 100644
--- a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
+++ b/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
@@ -44,6 +44,9 @@ SRC_URI =
"git://github.com/rpm-software-management/rpm;branch=rpm-4.14.x \
file://0001-mono-find-provides-requires-do-not-use-monodis-from-.patch \
"
+SRC_URI_append_class-nativesdk = "file://rpm-setup.py \
+ "
+
PE = "1"
SRCREV = "4a9440006398646583f0d9ae1837dad2875013aa"
@@ -113,6 +116,20 @@ do_install_append_class-nativesdk() {
done
rm -rf ${D}/var
+install -d ${D}${datadir}/rpm
+
+cat >${D}/${datadir}/rpm/rpmrc <${D}/${datadir}/rpm/platform <http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] dnf: make dnf work in toolchain
ping -- Zheng Ruoqin Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) ADDR.: No.6 Wenzhu Road, Software Avenue, Nanjing, 210012, China MAIL : zhengrq.f...@cn.fujistu.com > -Original Message- > From: openembedded-core-boun...@lists.openembedded.org > [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of > Zheng, Ruoqin > Sent: Wednesday, September 18, 2019 9:29 AM > To: openembedded-core@lists.openembedded.org > Subject: Re: [OE-core] [PATCH] dnf: make dnf work in toolchain > > Hi Richard > > > > you can run these with commands like: > > > > > > os-selftest -r sstatetests.SStateTests.test_sstate_allarch_samesigs > > One more question is that I executed os-selftest in my yocto build > environment, > and it was passed. So how could I reproduce the error log? > > /build$ oe-selftest -r sstatetests.SStateTests.test_sstate_allarch_samesigs > 2019-09-17 11:11:40,703 - oe-selftest - INFO - Adding layer libraries: > 2019-09-17 11:11:40,703 - oe-selftest - INFO - > /home/zhengrq/workdir/yotco/poky/meta/lib > 2019-09-17 11:11:40,704 - oe-selftest - INFO - > /home/zhengrq/workdir/yotco/poky/meta-yocto-bsp/lib > 2019-09-17 11:11:40,704 - oe-selftest - INFO - > /home/zhengrq/workdir/yotco/poky/meta-selftest/lib > 2019-09-17 11:11:40,704 - oe-selftest - INFO - > /home/zhengrq/workdir/yotco/meta-openembedded/meta-oe/lib > 2019-09-17 11:11:40,707 - oe-selftest - INFO - Running bitbake -e to test the > configuration is valid/parsable > 2019-09-17 11:11:42,406 - oe-selftest - INFO - Adding: "include selftest.inc" > in > /home/zhengrq/workdir/yotco/build/conf/local.conf > 2019-09-17 11:11:42,407 - oe-selftest - INFO - Adding: "include bblayers.inc" > in > bblayers.conf > 2019-09-17 11:11:42,407 - oe-selftest - INFO - test_sstate_allarch_samesigs > (sstatetests.SStateTests) > 2019-09-17 11:17:00,034 - oe-selftest - INFO - ... ok > 2019-09-17 11:17:00,047 - oe-selftest - INFO - > > -- > 2019-09-17 11:17:00,047 - oe-selftest - INFO - Ran 1 test in 317.641s > 2019-09-17 11:17:00,047 - oe-selftest - INFO - OK > fatal: not a git repository (or any of the parent directories): .git > fatal: not a git repository (or any of the parent directories): .git > fatal: not a git repository (or any of the parent directories): .git > 2019-09-17 11:17:07,025 - oe-selftest - INFO - RESULTS: > 2019-09-17 11:17:07,026 - oe-selftest - INFO - RESULTS - > sstatetests.SStateTests.test_sstate_allarch_samesigs: PASSED (317.64s) > 2019-09-17 11:17:07,065 - oe-selftest - INFO - SUMMARY: > 2019-09-17 11:17:07,065 - oe-selftest - INFO - oe-selftest () - Ran 1 test in > 317.642s > 2019-09-17 11:17:07,065 - oe-selftest - INFO - oe-selftest - OK - All > required tests > passed (successes=1, skipped=0, failures=0, errors=0) > > > -- > Zheng Ruoqin > Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) > ADDR.: No.6 Wenzhu Road, Software Avenue, >Nanjing, 210012, China > MAIL : zhengrq.f...@cn.fujistu.com > > > > -Original Message- > > From: openembedded-core-boun...@lists.openembedded.org > > [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf > Of > > Zheng, Ruoqin > > Sent: Tuesday, September 17, 2019 8:45 AM > > To: openembedded-core@lists.openembedded.org > > Subject: Re: [OE-core] [PATCH] dnf: make dnf work in toolchain > > > > Hi Richard > > > > > you can run these with commands like: > > > > > > os-selftest -r sstatetests.SStateTests.test_sstate_allarch_samesigs > > > > > > Cheers, > > > > Could you tell me what does the oe-selftest in here test for? > > Especially what do the signature tests test for? > > > > Thanks > > ------ > > Zheng Ruoqin > > Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) > > ADDR.: No.6 Wenzhu Road, Software Avenue, > >Nanjing, 210012, China > > MAIL : zhengrq.f...@cn.fujistu.com > > > > > > > -Original Message- > > > From: Richard Purdie [mailto:richard.pur...@linuxfoundation.org] > > > Sent: Monday, September 16, 2019 6:57 PM > > > To: Zheng, Ruoqin/郑 若钦 ; openembedded- > > > c...@lists.openembedded.org > > > Subject: Re: [OE-core] [PATCH] dnf: make dnf work in toolchain > > > > > > On Mon, 2019-09-16 at 14:36 +0800, Zheng Ruoqin wrote: > > > > We need to configure dnf to use package
Re: [OE-core] [PATCH] dnf: make dnf work in toolchain
Hi Richard
> > you can run these with commands like:
> >
> > os-selftest -r sstatetests.SStateTests.test_sstate_allarch_samesigs
One more question is that I executed os-selftest in my yocto build
environment, and it was passed. So how could I reproduce the error log?
/build$ oe-selftest -r sstatetests.SStateTests.test_sstate_allarch_samesigs
2019-09-17 11:11:40,703 - oe-selftest - INFO - Adding layer libraries:
2019-09-17 11:11:40,703 - oe-selftest - INFO -
/home/zhengrq/workdir/yotco/poky/meta/lib
2019-09-17 11:11:40,704 - oe-selftest - INFO -
/home/zhengrq/workdir/yotco/poky/meta-yocto-bsp/lib
2019-09-17 11:11:40,704 - oe-selftest - INFO -
/home/zhengrq/workdir/yotco/poky/meta-selftest/lib
2019-09-17 11:11:40,704 - oe-selftest - INFO -
/home/zhengrq/workdir/yotco/meta-openembedded/meta-oe/lib
2019-09-17 11:11:40,707 - oe-selftest - INFO - Running bitbake -e to test the
configuration is valid/parsable
2019-09-17 11:11:42,406 - oe-selftest - INFO - Adding: "include selftest.inc"
in /home/zhengrq/workdir/yotco/build/conf/local.conf
2019-09-17 11:11:42,407 - oe-selftest - INFO - Adding: "include bblayers.inc"
in bblayers.conf
2019-09-17 11:11:42,407 - oe-selftest - INFO - test_sstate_allarch_samesigs
(sstatetests.SStateTests)
2019-09-17 11:17:00,034 - oe-selftest - INFO - ... ok
2019-09-17 11:17:00,047 - oe-selftest - INFO -
--
2019-09-17 11:17:00,047 - oe-selftest - INFO - Ran 1 test in 317.641s
2019-09-17 11:17:00,047 - oe-selftest - INFO - OK
fatal: not a git repository (or any of the parent directories): .git
fatal: not a git repository (or any of the parent directories): .git
fatal: not a git repository (or any of the parent directories): .git
2019-09-17 11:17:07,025 - oe-selftest - INFO - RESULTS:
2019-09-17 11:17:07,026 - oe-selftest - INFO - RESULTS -
sstatetests.SStateTests.test_sstate_allarch_samesigs: PASSED (317.64s)
2019-09-17 11:17:07,065 - oe-selftest - INFO - SUMMARY:
2019-09-17 11:17:07,065 - oe-selftest - INFO - oe-selftest () - Ran 1 test in
317.642s
2019-09-17 11:17:07,065 - oe-selftest - INFO - oe-selftest - OK - All required
tests passed (successes=1, skipped=0, failures=0, errors=0)
------
Zheng Ruoqin
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
ADDR.: No.6 Wenzhu Road, Software Avenue,
Nanjing, 210012, China
MAIL : zhengrq.f...@cn.fujistu.com
> -Original Message-
> From: openembedded-core-boun...@lists.openembedded.org
> [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of
> Zheng, Ruoqin
> Sent: Tuesday, September 17, 2019 8:45 AM
> To: openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH] dnf: make dnf work in toolchain
>
> Hi Richard
>
> > you can run these with commands like:
> >
> > os-selftest -r sstatetests.SStateTests.test_sstate_allarch_samesigs
> >
> > Cheers,
>
> Could you tell me what does the oe-selftest in here test for? Especially
> what do
> the signature tests test for?
>
> Thanks
> --
> Zheng Ruoqin
> Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
> ADDR.: No.6 Wenzhu Road, Software Avenue,
>Nanjing, 210012, China
> MAIL : zhengrq.f...@cn.fujistu.com
>
>
> > -----Original Message-
> > From: Richard Purdie [mailto:richard.pur...@linuxfoundation.org]
> > Sent: Monday, September 16, 2019 6:57 PM
> > To: Zheng, Ruoqin/郑 若钦 ; openembedded-
> > c...@lists.openembedded.org
> > Subject: Re: [OE-core] [PATCH] dnf: make dnf work in toolchain
> >
> > On Mon, 2019-09-16 at 14:36 +0800, Zheng Ruoqin wrote:
> > > We need to configure dnf to use package architecture from yocto
> > > build system.
> > >
> > > Install etc/dnf/vars to ${SDKTARGETSYSROOT} because config file in
> > > host-sysroot as /opt/poky/2.7+snapshot/sysroots/x86_64-pokysdk-linux
> > > will be covered by another ARCH which result in previous config
> > > settings inefficacy.
> > >
> > > To resolve it, put config file in target-sysroot like
> > > /opt/poky/2.7+snapshot/sysroots/core2-64-poky-linux. As each ARCH
> > > has its own target-sysroot, config file will not be covered.
> >
> > I'm afraid we can't have target dependencies within nativesdk packages.
> >
> > This is shown by the fact this patch (and the similar rpm one) cause
> > selftest failures in the signature tests:
> >
> > https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/381/
> > steps/8
> > /logs/step2d
> >
> > 2019-09-16 00:24:54,670 - oe-selftest - INFO - RESULTS -
> > sstatetests.SStateTests.tes
Re: [OE-core] [PATCH] dnf: make dnf work in toolchain
Hi Richard
> you can run these with commands like:
>
> os-selftest -r sstatetests.SStateTests.test_sstate_allarch_samesigs
>
> Cheers,
Could you tell me what does the oe-selftest in here test for? Especially what
do the signature tests test for?
Thanks
------
Zheng Ruoqin
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
ADDR.: No.6 Wenzhu Road, Software Avenue,
Nanjing, 210012, China
MAIL : zhengrq.f...@cn.fujistu.com
> -Original Message-
> From: Richard Purdie [mailto:richard.pur...@linuxfoundation.org]
> Sent: Monday, September 16, 2019 6:57 PM
> To: Zheng, Ruoqin/郑 若钦 ; openembedded-
> c...@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH] dnf: make dnf work in toolchain
>
> On Mon, 2019-09-16 at 14:36 +0800, Zheng Ruoqin wrote:
> > We need to configure dnf to use package architecture from yocto build
> > system.
> >
> > Install etc/dnf/vars to ${SDKTARGETSYSROOT} because config file in
> > host-sysroot as /opt/poky/2.7+snapshot/sysroots/x86_64-pokysdk-linux
> > will be covered by another ARCH which result in previous config
> > settings inefficacy.
> >
> > To resolve it, put config file in target-sysroot like
> > /opt/poky/2.7+snapshot/sysroots/core2-64-poky-linux. As each ARCH has
> > its own target-sysroot, config file will not be covered.
>
> I'm afraid we can't have target dependencies within nativesdk packages.
>
> This is shown by the fact this patch (and the similar rpm one) cause selftest
> failures in the signature tests:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/381/steps/8
> /logs/step2d
>
> 2019-09-16 00:24:54,670 - oe-selftest - INFO - RESULTS -
> sstatetests.SStateTests.test_sstate_allarch_samesigs: FAILED (111.59s)
> 2019-09-16 00:24:54,670 - oe-selftest - INFO - RESULTS -
> sstatetests.SStateTests.test_sstate_nativesdk_samesigs_multilib: FAILED
> (144.14s)
> 2019-09-16 00:24:54,670 - oe-selftest - INFO - RESULTS -
> sstatetests.SStateTests.test_sstate_sametune_samesigs: FAILED (161.53s)
>
> you can run these with commands like:
>
> os-selftest -r sstatetests.SStateTests.test_sstate_allarch_samesigs
>
> Cheers,
>
> Richard
>
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] dnf: make dnf work in toolchain
We need to configure dnf to use package architecture from yocto build system.
Install etc/dnf/vars to ${SDKTARGETSYSROOT} because config file in host-sysroot
as /opt/poky/2.7+snapshot/sysroots/x86_64-pokysdk-linux will be covered by
another ARCH which result in previous config settings inefficacy.
To resolve it, put config file in target-sysroot like
/opt/poky/2.7+snapshot/sysroots/core2-64-poky-linux. As each ARCH has its own
target-sysroot, config file will not be covered.
Signed-off-by: Zheng Ruoqin
---
meta/recipes-devtools/dnf/dnf_4.2.2.bb | 14 ++
1 file changed, 14 insertions(+)
diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb
b/meta/recipes-devtools/dnf/dnf_4.2.2.bb
index c3332c..02500a33c2 100644
--- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb
+++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb
@@ -68,10 +68,22 @@ do_install_append_class-native() {
RPM_NO_CHROOT_FOR_SCRIPTS=1
}
+
+REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}-${DISTRO}-${TARGET_OS}"
+SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${REAL_MULTIMACH_TARGET_SYS}"
+
do_install_append_class-nativesdk() {
create_wrapper ${D}/${bindir}/dnf \
RPM_CONFIGDIR=${SDKPATHNATIVE}${libdir_nativesdk}/rpm \
RPM_NO_CHROOT_FOR_SCRIPTS=1
+
+install -d ${D}/${SDKTARGETSYSROOT}/etc/dnf/vars
+cat >${D}/${SDKTARGETSYSROOT}/etc/dnf/vars/arch <http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3] rpm: make rpm work in toolchain.
We need to configure rpm to use package architecture from yocto build system.
Install rpmrc and rpm/platform to ${SDKTARGETSYSROOT} because config file in
host-sysroot as /opt/poky/2.7+snapshot/sysroots/x86_64-pokysdk-linux will be
covered by another ARCH which result in previous config settings inefficacy.
To resolve it, put config file in target-sysroot like
/opt/poky/2.7+snapshot/sysroots/core2-64-poky-linux. As each ARCH has its own
target-sysroot, config file will not be covered.
Signed-off-by: Zheng Ruoqin
---
meta/recipes-devtools/rpm/rpm_4.14.2.1.bb | 16
1 file changed, 16 insertions(+)
diff --git a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
b/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
index 063f4269a5..5634f6702f 100644
--- a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
+++ b/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
@@ -102,6 +102,9 @@ do_install_append_class-native() {
done
}
+REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}-${DISTRO}-${TARGET_OS}"
+SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${REAL_MULTIMACH_TARGET_SYS}"
+
do_install_append_class-nativesdk() {
for tool in ${WRAPPER_TOOLS}; do
create_wrapper ${D}$tool \
@@ -112,6 +115,17 @@ do_install_append_class-nativesdk() {
done
rm -rf ${D}/var
+install -d ${D}/${SDKTARGETSYSROOT}/etc/rpm
+
+cat >${D}/${SDKTARGETSYSROOT}/etc/rpmrc <${D}/${SDKTARGETSYSROOT}/etc/rpm/platform <http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] rpm: make rpm work in toolchain.
Hi Alex
->You probably need to use the post-relocate-setup.d/ facility, like the
nativesdk-meson recipe does. I am not sure if ->PACKAGE_ARCHS is accessible
from it, but it does seem like the right mechanism for tweaking settings that
are ->specific to nativesdk packages.
1. About ${PACKAGE_ARCHS}
Well, for nativesdk packages ${PACKAGE_ARCHS} is accessible from
nativesdk.bbclass, and it equals
PACKAGE_ARCHS = "${SDK_PACKAGE_ARCHS}"
SDK_PACKAGE_ARCHS = "all any noarch ${SDK_ARCH}-${SDKPKGSUFFIX}"
Which will not be changed for different ARCH.
While target packages ${PACKAGE_ARCHS} is accessible from base.bbclass, and the
value is suitable for different ARCH.
2. About post-relocate-setup.d
And usually, tweaking settings are specific to nativesdk packages. But Even if
I use the post-relocate-setup.d/ facility, as the value of ${MACHINE_ARCH} is
not provided in SDK, so it will not work for target packages.
To skip it, I have to write arch info in config file explicitly for different
target ARCH as only meta-environment has a similar implementation.
3. Actually, my first plan is to write ${MACHINE_ARCH} in toolchain, but it
was rejected
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -101,6 +101,7 @@ toolchain_shared_env_script () {
echo 'export CPPFLAGS="${TARGET_CPPFLAGS}"' >> $script
echo 'export KCFLAGS="--sysroot=$SDKTARGETSYSROOT"' >> $script
echo 'export OECORE_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
+ echo 'export MACHINE_ARCH=${MACHINE_ARCH}' >> $script
echo 'export OECORE_SDK_VERSION="${SDK_VERSION}"' >> $script
I guess if it can work, maybe post-relocate-setup.d/ facility will be usefull.
--
Zheng Ruoqin
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
ADDR.: No.6 Wenzhu Road, Software Avenue,
Nanjing, 210012, China
MAIL : zhengrq.f...@cn.fujistu.com
From: Alexander Kanavin [mailto:alex.kana...@gmail.com]
Sent: Tuesday, September 10, 2019 6:53 PM
To: Zheng, Ruoqin/郑 若钦
Cc: OE-core
Subject: Re: [OE-core] [PATCH] rpm: make rpm work in toolchain.
On Tue, 10 Sep 2019 at 10:07, Zheng, Ruoqin
mailto:zhengrq.f...@cn.fujitsu.com>> wrote:
In last patch, I put the config file in meta-environment as its do_install task
is in the target environment which means the value of ${PACKAGE_ARCHS} is right.
And it finally produce a nativesdk package.
If I put the config file in nativesdk-rpm, the value of ${PACKAGE_ARCHS} will
always be “all any noarch x86_64-nativesdk” which is not suitable for x86, arm
and other ARCHS.
So I’d like to put config file in the rpm of meta-environment. Did you have any
good Suggestions?
You probably need to use the post-relocate-setup.d/ facility, like the
nativesdk-meson recipe does. I am not sure if PACKAGE_ARCHS is accessible from
it, but it does seem like the right mechanism for tweaking settings that are
specific to nativesdk packages.
Alex
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] rpm: make rpm work in toolchain.
Hi Alex
Now I have a question after a test.
In last patch, I put the config file in meta-environment as its do_install task
is in the target environment which means the value of ${PACKAGE_ARCHS} is right.
And it finally produce a nativesdk package.
If I put the config file in nativesdk-rpm, the value of ${PACKAGE_ARCHS} will
always be “all any noarch x86_64-nativesdk” which is not suitable for x86, arm
and other ARCHS.
So I’d like to put config file in the rpm of meta-environment. Did you have any
good Suggestions?
--
Zheng Ruoqin
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
ADDR.: No.6 Wenzhu Road, Software Avenue,
Nanjing, 210012, China
MAIL : zhengrq.f...@cn.fujistu.com
From: Alexander Kanavin [mailto:alex.kana...@gmail.com]
Sent: Monday, September 09, 2019 9:07 PM
To: Zheng, Ruoqin/郑 若钦
Cc: OE-core
Subject: Re: [OE-core] [PATCH] rpm: make rpm work in toolchain.
On Mon, 9 Sep 2019 at 13:19, Zheng, Ruoqin
mailto:zhengrq.f...@cn.fujitsu.com>> wrote:
->What do these two sed commands do? If we create /etc/rpmrc just above, can it
have the right content from the beginning?
Well, in the environment in Yocto Build system, the value of ${PACKAGE_ARCHS}
include “–nativesdk” as not needed in SDK environment.
And the ARCH name of core2-64 rpm is core2_64 like rpm-4.14.2.1-r0.core2_64.rpm.
So I modify the ARCH name in etc/rpmrc.
Thanks, can you put a comment in front of the sed commands explaining that? It
would be useful to anyone who reads the recipe.
Alex
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] rpm: make rpm work in toolchain.
Hi Alex:
Ok, I will send a V3 patch.
--
Zheng Ruoqin
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
ADDR.: No.6 Wenzhu Road, Software Avenue,
Nanjing, 210012, China
MAIL : zhengrq.f...@cn.fujistu.com
From: Alexander Kanavin [mailto:alex.kana...@gmail.com]
Sent: Monday, September 09, 2019 9:07 PM
To: Zheng, Ruoqin/郑 若钦
Cc: OE-core
Subject: Re: [OE-core] [PATCH] rpm: make rpm work in toolchain.
On Mon, 9 Sep 2019 at 13:19, Zheng, Ruoqin
mailto:zhengrq.f...@cn.fujitsu.com>> wrote:
->What do these two sed commands do? If we create /etc/rpmrc just above, can it
have the right content from the beginning?
Well, in the environment in Yocto Build system, the value of ${PACKAGE_ARCHS}
include “–nativesdk” as not needed in SDK environment.
And the ARCH name of core2-64 rpm is core2_64 like rpm-4.14.2.1-r0.core2_64.rpm.
So I modify the ARCH name in etc/rpmrc.
Thanks, can you put a comment in front of the sed commands explaining that? It
would be useful to anyone who reads the recipe.
Alex
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] rpm: make rpm work in toolchain.
We need to configure rpm to use package architecture from yocto build system.
Install rpmrc and rpm/platform to ${SDKTARGETSYSROOT} because config file in
host-sysroot as /opt/poky/2.7+snapshot/sysroots/x86_64-pokysdk-linux will be
covered by another ARCH which result in prvious config settings inefficacy.
To resolve it, put config file in target-sysroot like
/opt/poky/2.7+snapshot/sysroots/core2-64-poky-linux. As each ARCH has its own
target-sysroot, config file will not be covered.
Signed-off-by: Zheng Ruoqin
---
meta/recipes-devtools/rpm/rpm_4.14.2.1.bb | 15 +++
1 file changed, 15 insertions(+)
diff --git a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
b/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
index 063f4269a5..af8e144f96 100644
--- a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
+++ b/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
@@ -102,6 +102,9 @@ do_install_append_class-native() {
done
}
+REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}"
+SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${REAL_MULTIMACH_TARGET_SYS}"
+
do_install_append_class-nativesdk() {
for tool in ${WRAPPER_TOOLS}; do
create_wrapper ${D}$tool \
@@ -112,6 +115,16 @@ do_install_append_class-nativesdk() {
done
rm -rf ${D}/var
+install -d ${D}/${SDKTARGETSYSROOT}/etc/rpm
+
+cat >${D}/${SDKTARGETSYSROOT}/etc/rpmrc <${D}/${SDKTARGETSYSROOT}/etc/rpm/platform <http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] rpm: make rpm work in toolchain.
Hi Alex
I’d like to explain it.
->Why not simply ${D}/etc/rpm?
As you see, ${SDKTARGETSYSROOT} for x86_64 is
/opt/poky/2.7+snapshot/sysroots/core2-64-pokysdk-linux.
I make it because config file in host-sysroot as
/opt/poky/2.7+snapshot/sysroots/x86_64-pokysdk-linux will be covered by
another ARCH.
For example, first install SDK for x86_64, and next install SDK for x86, as
host-sysroot is same, the same config file will be covered. In that case config
settings for x86_64 will be inefficacy.
To resolve that problem, I put config file in target-sysroot like
/opt/poky/2.7+snapshot/sysroots/core2-64-poky-linux. As each ARCH has its own
target-sysroot, config file will not be covered.
That was also why I put config file in meta-environment in last patch.
->What do these two sed commands do? If we create /etc/rpmrc just above, can it
have the right content from the beginning?
Well, in the environment in Yocto Build system, the value of ${PACKAGE_ARCHS}
include “–nativesdk” as not needed in SDK environment.
And the ARCH name of core2-64 rpm is core2_64 like rpm-4.14.2.1-r0.core2_64.rpm.
So I modify the ARCH name in etc/rpmrc.
--
Zheng Ruoqin
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
ADDR.: No.6 Wenzhu Road, Software Avenue,
Nanjing, 210012, China
MAIL : zhengrq.f...@cn.fujistu.com
From: Alexander Kanavin [mailto:alex.kana...@gmail.com]
Sent: Monday, September 09, 2019 7:07 PM
To: Zheng, Ruoqin/郑 若钦
Cc: OE-core
Subject: Re: [OE-core] [PATCH] rpm: make rpm work in toolchain.
On Mon, 9 Sep 2019 at 12:58, Zheng Ruoqin
mailto:zhengrq.f...@cn.fujitsu.com>> wrote:
rm -rf ${D}/var
+install -d ${D}/${SDKTARGETSYSROOT}/etc/rpm
Why not simply ${D}/etc/rpm?
+sed -i 's/-nativesdk//g' ${D}/${SDKTARGETSYSROOT}/etc/rpmrc
+sed -i 's/-/_/' ${D}/${SDKTARGETSYSROOT}/etc/rpmrc
What do these two sed commands do? If we create /etc/rpmrc just above, can it
have the right content from the beginning?
"
+FILES_${PN}_append_class-nativesdk += "${SDKTARGETSYSROOT}"
Same question: why is ${SDKTARGETSYSROOT} needed? The configuration files
should be in /etc, and rpm should be instructed to pick them up from there,
same way as it is done for -native variant when building an image.
Alex
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] rpm: make rpm work in toolchain.
Hi Alex
I'd like to explain the path ${SDKTARGETSYSROOT} in this patch.
As you see, ${SDKTARGETSYSROOT} for x86_64 is
/opt/poky/2.7+snapshot/sysroots/core2-64-pokysdk-linux.
I make it because config file in host-sysroot as
/opt/poky/2.7+snapshot/sysroots/x86_64-pokysdk-linux will be covered by
another ARCH.
For example, first install SDK for x86_64, and next install SDK for x86, as
host-sysroot is same, the same config file will be covered. In that case config
settings for x86_64 will be inefficacy.
To resolve that problem, I put config file in target-sysroot like
/opt/poky/2.7+snapshot/sysroots/core2-64-poky-linux. As each ARCH has its own
target-sysroot, config file will not be covered.
--
--
Zheng Ruoqin
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
ADDR.: No.6 Wenzhu Road, Software Avenue,
Nanjing, 210012, China
MAIL : zhengrq.f...@cn.fujistu.com
> -Original Message-
> From: Zheng, Ruoqin/郑 若钦
> Sent: Monday, September 09, 2019 6:57 PM
> To: openembedded-core@lists.openembedded.org
> Cc: Zheng, Ruoqin/郑 若钦
> Subject: [OE-core][PATCH] rpm: make rpm work in toolchain.
>
> We need to configure rpm to use package architecture from yocto build system.
>
> Signed-off-by: Zheng Ruoqin
> ---
> meta/recipes-devtools/rpm/rpm_4.14.2.1.bb | 15 +++
> 1 file changed, 15 insertions(+)
>
> diff --git a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb b/meta/recipes-
> devtools/rpm/rpm_4.14.2.1.bb
> index 063f4269a5..af8e144f96 100644
> --- a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
> +++ b/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
> @@ -102,6 +102,9 @@ do_install_append_class-native() {
> done
> }
>
> +REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-
> ${TARGET_OS}"
> +SDKTARGETSYSROOT =
> "${SDKPATH}/sysroots/${REAL_MULTIMACH_TARGET_SYS}"
> +
> do_install_append_class-nativesdk() {
> for tool in ${WRAPPER_TOOLS}; do
> create_wrapper ${D}$tool \ @@ -112,6 +115,16 @@
> do_install_append_class-nativesdk() {
> done
>
> rm -rf ${D}/var
> +install -d ${D}/${SDKTARGETSYSROOT}/etc/rpm
> +
> +cat >${D}/${SDKTARGETSYSROOT}/etc/rpmrc < +arch_compat: ${MACHINE_ARCH}: ${PACKAGE_ARCHS} EOF
> +sed -i 's/-nativesdk//g' ${D}/${SDKTARGETSYSROOT}/etc/rpmrc
> +sed -i 's/-/_/' ${D}/${SDKTARGETSYSROOT}/etc/rpmrc
> +cat >${D}/${SDKTARGETSYSROOT}/etc/rpm/platform < +${MACHINE_ARCH}-pc-linux EOF
> }
>
> # Rpm's make install creates var/tmp which clashes with base-files packaging
> @@ -133,6 +146,8 @@ FILES_${PN} += "${libdir}/rpm-plugins/*.so \
>
> FILES_${PN}-dev += "${libdir}/rpm-plugins/*.la \
> "
> +FILES_${PN}_append_class-nativesdk += "${SDKTARGETSYSROOT}"
> +
>
> PACKAGES += "python3-rpm"
> PROVIDES += "python3-rpm"
> --
> 2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] rpm: make rpm work in toolchain.
We need to configure rpm to use package architecture from yocto build
system.
Signed-off-by: Zheng Ruoqin
---
meta/recipes-devtools/rpm/rpm_4.14.2.1.bb | 15 +++
1 file changed, 15 insertions(+)
diff --git a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
b/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
index 063f4269a5..af8e144f96 100644
--- a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
+++ b/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb
@@ -102,6 +102,9 @@ do_install_append_class-native() {
done
}
+REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}"
+SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${REAL_MULTIMACH_TARGET_SYS}"
+
do_install_append_class-nativesdk() {
for tool in ${WRAPPER_TOOLS}; do
create_wrapper ${D}$tool \
@@ -112,6 +115,16 @@ do_install_append_class-nativesdk() {
done
rm -rf ${D}/var
+install -d ${D}/${SDKTARGETSYSROOT}/etc/rpm
+
+cat >${D}/${SDKTARGETSYSROOT}/etc/rpmrc <${D}/${SDKTARGETSYSROOT}/etc/rpm/platform <http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] meta-environment: make rpm and dnf work in toolchain
Hi Alex
Thank you for your advice and I have a question.
1:-> This does not seem like the right place to me to adjust the settings.
Well, did you mean that I shouldn’t adjust the settings in meta-environment
recipe, instead of it, adjust the settings in the nativesdk-meson recipe?
--
Zheng Ruoqin
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
From: Alexander Kanavin [mailto:alex.kana...@gmail.com]
Sent: Monday, September 02, 2019 4:12 PM
To: Zheng, Ruoqin/郑 若钦
Cc: OE-core
Subject: Re: [OE-core] [PATCH] meta-environment: make rpm and dnf work in
toolchain
On Mon, 2 Sep 2019 at 03:16, Zheng Ruoqin
mailto:zhengrq.f...@cn.fujitsu.com>> wrote:
We need to configure dnf and rpm to use and make it compatible with package
architecture from yocto build system.
+
+mkdir -p ${D}/${SDKTARGETSYSROOT}/etc/rpm
+echo "arch_compat: ${MACHINE_ARCH}: ${PACKAGE_ARCHS}" >
${D}/${SDKTARGETSYSROOT}/etc/rpmrc
+sed -i 's/-nativesdk//g' ${D}/${SDKTARGETSYSROOT}/etc/rpmrc
+sed -i 's/-/_/' ${D}/${SDKTARGETSYSROOT}/etc/rpmrc
+echo "${MACHINE_ARCH}-pc-linux" > ${D}/${SDKTARGETSYSROOT}/etc/rpm/platform
+
+mkdir -p ${D}/${SDKTARGETSYSROOT}/etc/dnf/vars
+echo "${DEFAULTTUNE}:${MACHINE_ARCH}:${TARGET_ARCH}" >
${D}/${SDKTARGETSYSROOT}/etc/dnf/vars/arch
+sed -i 's/-/_/' ${D}/${SDKTARGETSYSROOT}/etc/dnf/vars/arch
This does not seem like the right place to me to adjust the settings. I think
(not sure; never tried it) that the right technique is in the nativesdk-meson
recipe:
install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d
install -m 0755 ${WORKDIR}/meson-setup.py
${D}${SDKPATHNATIVE}/post-relocate-setup.d/
# We need to wrap the real meson with a thin env setup wrapper.
mv ${D}${bindir}/meson ${D}${bindir}/meson.real
install -m 0755 ${WORKDIR}/meson-wrapper ${D}${bindir}/meson
Alex
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] meta-environment: make rpm and dnf work in toolchain
We need to configure dnf and rpm to use and make it compatible with package
architecture from yocto build system.
Signed-off-by: Zheng Ruoqin
---
meta/recipes-core/meta/meta-environment.bb | 10 ++
1 file changed, 10 insertions(+)
diff --git a/meta/recipes-core/meta/meta-environment.bb
b/meta/recipes-core/meta/meta-environment.bb
index da1230bead..3b25dcc8d0 100644
--- a/meta/recipes-core/meta/meta-environment.bb
+++ b/meta/recipes-core/meta/meta-environment.bb
@@ -62,6 +62,16 @@ create_sdk_files() {
do_install() {
install -d ${D}/${SDKPATH}
install -m 0644 -t ${D}/${SDKPATH} ${SDK_OUTPUT}/${SDKPATH}/*
+
+mkdir -p ${D}/${SDKTARGETSYSROOT}/etc/rpm
+echo "arch_compat: ${MACHINE_ARCH}: ${PACKAGE_ARCHS}" >
${D}/${SDKTARGETSYSROOT}/etc/rpmrc
+sed -i 's/-nativesdk//g' ${D}/${SDKTARGETSYSROOT}/etc/rpmrc
+sed -i 's/-/_/' ${D}/${SDKTARGETSYSROOT}/etc/rpmrc
+echo "${MACHINE_ARCH}-pc-linux" > ${D}/${SDKTARGETSYSROOT}/etc/rpm/platform
+
+mkdir -p ${D}/${SDKTARGETSYSROOT}/etc/dnf/vars
+echo "${DEFAULTTUNE}:${MACHINE_ARCH}:${TARGET_ARCH}" >
${D}/${SDKTARGETSYSROOT}/etc/dnf/vars/arch
+sed -i 's/-/_/' ${D}/${SDKTARGETSYSROOT}/etc/dnf/vars/arch
}
PN = "meta-environment-${MACHINE}"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] toolchain-scripts: make rpm work in toolchain
Hi
Sorry, I have missed the previous mail. So please ignore this mail. I will
think about a new way to fix this problem.
--
Zheng Ruoqin
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
ADDR.: No.6 Wenzhu Road, Software Avenue,
Nanjing, 210012, China
MAIL : zhengrq.f...@cn.fujistu.com
> -Original Message-
> From: Zheng, Ruoqin/郑 若钦
> Sent: Monday, August 12, 2019 11:15 AM
> To: openembedded-core@lists.openembedded.org
> Cc: Zheng, Ruoqin/郑 若钦
> Subject: [OE-core][PATCH v2] toolchain-scripts: make rpm work in toolchain
>
> Rpm need to read the arch info, but $script did not provide it, so add it.
>
> Signed-off-by: Zheng Ruoqin
> ---
> meta/classes/toolchain-scripts.bbclass | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-
> scripts.bbclass
> index 1a2ec4f3b2..de50b7ec69 100644
> --- a/meta/classes/toolchain-scripts.bbclass
> +++ b/meta/classes/toolchain-scripts.bbclass
> @@ -101,6 +101,7 @@ toolchain_shared_env_script () {
> echo 'export CPPFLAGS="${TARGET_CPPFLAGS}"' >> $script
> echo 'export KCFLAGS="--sysroot=$SDKTARGETSYSROOT"' >> $script
> echo 'export OECORE_DISTRO_VERSION="${DISTRO_VERSION}"' >>
> $script
> + echo 'export MACHINE_ARCH=${MACHINE_ARCH}' >> $script
> echo 'export OECORE_SDK_VERSION="${SDK_VERSION}"' >> $script
> echo 'export ARCH=${ARCH}' >> $script
> echo 'export CROSS_COMPILE=${TARGET_PREFIX}' >> $script
> --
> 2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] toolchain-scripts: make rpm work in toolchain
Rpm need to read the arch info, but $script did not provide it, so add it.
Signed-off-by: Zheng Ruoqin
---
meta/classes/toolchain-scripts.bbclass | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/classes/toolchain-scripts.bbclass
b/meta/classes/toolchain-scripts.bbclass
index 1a2ec4f3b2..de50b7ec69 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -101,6 +101,7 @@ toolchain_shared_env_script () {
echo 'export CPPFLAGS="${TARGET_CPPFLAGS}"' >> $script
echo 'export KCFLAGS="--sysroot=$SDKTARGETSYSROOT"' >> $script
echo 'export OECORE_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
+ echo 'export MACHINE_ARCH=${MACHINE_ARCH}' >> $script
echo 'export OECORE_SDK_VERSION="${SDK_VERSION}"' >> $script
echo 'export ARCH=${ARCH}' >> $script
echo 'export CROSS_COMPILE=${TARGET_PREFIX}' >> $script
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python3-mako: 1.0.14 -> 1.1.0
Upgrade python3-mako from 1.0.14 to 1.1.0.
Signed-off-by: Zheng Ruoqin
---
.../python/{python3-mako_1.0.14.bb => python3-mako_1.1.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python3-mako_1.0.14.bb =>
python3-mako_1.1.0.bb} (75%)
diff --git a/meta/recipes-devtools/python/python3-mako_1.0.14.bb
b/meta/recipes-devtools/python/python3-mako_1.1.0.bb
similarity index 75%
rename from meta/recipes-devtools/python/python3-mako_1.0.14.bb
rename to meta/recipes-devtools/python/python3-mako_1.1.0.bb
index d2f5188cc4..b139e5ab00 100644
--- a/meta/recipes-devtools/python/python3-mako_1.0.14.bb
+++ b/meta/recipes-devtools/python/python3-mako_1.1.0.bb
@@ -8,8 +8,8 @@ PYPI_PACKAGE = "Mako"
inherit pypi setuptools3
-SRC_URI[md5sum] = "e162578170331f0cc6a4adb063c7c0f6"
-SRC_URI[sha256sum] =
"f5a642d8c5699269ab62a68b296ff990767eb120f51e2e8f3d6afb16bdb57f4b"
+SRC_URI[md5sum] = "6c3f2da0b74af529a4c4a537d0848bf2"
+SRC_URI[sha256sum] =
"a36919599a9b7dc5d86a7a8988f23a9a3a3d083070023bab23d64f7f1d1e0a4b"
RDEPENDS_${PN} = "${PYTHON_PN}-html \
${PYTHON_PN}-netclient \
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in toolchain
ping -- Zheng Ruoqin Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) ADDR.: No.6 Wenzhu Road, Software Avenue, Nanjing, 210012, China MAIL : zhengrq.f...@cn.fujistu.com > -Original Message- > From: openembedded-core-boun...@lists.openembedded.org > [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of > Lei, Maohui > Sent: Tuesday, June 04, 2019 4:30 PM > To: Richard Purdie > Cc: openembedded-core@lists.openembedded.org > Subject: Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in toolchain > > Hi Richard > > This patch is necessary for dnf-nativesdk which has been merged. But this > patch > is still ignored. > Do you have any comment about this patch? > > Best regards. > Lei Maohui > > > > -Original Message- > > From: openembedded-core-boun...@lists.openembedded.org > > [mailto:openembedded- core-boun...@lists.openembedded.org] On Behalf > > Of Lei, Maohui > > Sent: Tuesday, May 28, 2019 1:08 PM > > To: Richard Purdie; openembedded-core@lists.openembedded.org > > Subject: Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in > > toolchain > > > > ping > > > > > -Original Message- > > > From: openembedded-core-boun...@lists.openembedded.org > > > [mailto:openembedded- core-boun...@lists.openembedded.org] On Behalf > > > Of Lei, Maohui > > > Sent: Tuesday, May 14, 2019 2:31 PM > > > To: openembedded-core@lists.openembedded.org > > > Subject: Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in > > > toolchain > > > > > > Hi, > > > > > > This patch hasn't been merged yet. Are there any suggestions? > > > > > > Best regards > > > Lei > > > > > > > -Original Message- > > > > From: openembedded-core-boun...@lists.openembedded.org > > [mailto:openembedded- > > > > core-boun...@lists.openembedded.org] On Behalf Of Lei, Maohui > > > > Sent: Wednesday, May 08, 2019 11:36 AM > > > > To: openembedded-core@lists.openembedded.org > > > > Subject: Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in > > toolchain > > > > > > > > Ping > > > > > > > > > -Original Message- > > > > > From: openembedded-core-boun...@lists.openembedded.org > > > [mailto:openembedded- > > > > > core-boun...@lists.openembedded.org] On Behalf Of Lei, Maohui > > > > > Sent: Friday, April 26, 2019 1:56 PM > > > > > To: openembedded-core@lists.openembedded.org > > > > > Subject: Re: [OE-core] [PATCH] toolchain-scripts: make rpm work > > > > > in > > > toolchain > > > > > > > > > > Hi, > > > > > > > > > > I noticed that " dnf: Enable nativesdk " has been merged into > > > > > master-next. > > > > This > > > > > patch is necessary for dnf-nativesdk, so please merge too. > > > > > > > > > > Best regards > > > > > Lei > > > > > > > > > > > > > > > > -Original Message- > > > > > > From: openembedded-core-boun...@lists.openembedded.org > > > > [mailto:openembedded- > > > > > > core-boun...@lists.openembedded.org] On Behalf Of Zheng, > > > > > > Ruoqin > > > > > > Sent: Friday, April 19, 2019 10:55 AM > > > > > > To: openembedded-core@lists.openembedded.org > > > > > > Subject: Re: [OE-core] [PATCH] toolchain-scripts: make rpm > > > > > > work in > > > > toolchain > > > > > > > > > > > > ping > > > > > > > > > > > > -- > > > > > > Zheng Ruoqin > > > > > > Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) > > > > > > ADDR.: No.6 Wenzhu Road, Software Avenue, > > > > > >Nanjing, 210012, China > > > > > > MAIL : zhengrq.f...@cn.fujistu.com > > > > > > > > > > > > > > > > > > > -Original Message- > > > > > > > From: Zheng, Ruoqin > > > > > > > Sent: Saturday, April 13, 2019 10:37 PM > > > > > > > To: openembedded-core@lists.openembedded.org > > > > > > > Cc: Zheng, Ruoqin > > >
Re: [OE-core] [PATCH v2] dnf: Enable nativesdk
Ping
--
Zheng Ruoqin
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
ADDR.: No.6 Wenzhu Road, Software Avenue,
Nanjing, 210012, China
MAIL : zhengrq.f...@cn.fujistu.com
> -Original Message-
> From: openembedded-core-boun...@lists.openembedded.org
> [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of
> Zheng, Ruoqin
> Sent: Tuesday, April 16, 2019 7:17 PM
> To: openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH v2] dnf: Enable nativesdk
>
> Ping
>
> ------
> Zheng Ruoqin
> Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
> ADDR.: No.6 Wenzhu Road, Software Avenue,
>Nanjing, 210012, China
> MAIL : zhengrq.f...@cn.fujistu.com
>
>
> > -Original Message-
> > From: Zheng, Ruoqin/郑 若钦
> > Sent: Saturday, April 13, 2019 10:36 PM
> > To: openembedded-core@lists.openembedded.org
> > Cc: Zheng, Ruoqin/郑 若钦
> > Subject: [OE-core] [PATCH v2] dnf: Enable nativesdk
> >
> > Make dnf work on nativesdk environment.
> >
> > Signed-off-by: Zheng Ruoqin
> > ---
> > meta/recipes-devtools/dnf/dnf_4.1.0.bb | 10 +-
> > 1 file changed, 9 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-devtools/dnf/dnf_4.1.0.bb b/meta/recipes-
> > devtools/dnf/dnf_4.1.0.bb index d45023e..8b4291a 100644
> > --- a/meta/recipes-devtools/dnf/dnf_4.1.0.bb
> > +++ b/meta/recipes-devtools/dnf/dnf_4.1.0.bb
> > @@ -26,7 +26,7 @@ EXTRA_OECMAKE = " -DWITH_MAN=0 -
> > DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -
> >
> > BBCLASSEXTEND = "native nativesdk"
> >
> > -RDEPENDS_${PN}_class-target += " \
> > +RDEPENDS_${PN} += " \
> >python3-core \
> >python3-codecs \
> >python3-netclient \
> > @@ -49,6 +49,8 @@ RDEPENDS_${PN}_class-target += " \
> >python3-gpg \
> >"
> >
> > +RDEPENDS_${PN}_class-native = ""
> > +
> > RRECOMMENDS_${PN}_class-target += "gnupg"
> >
> > # Create a symlink called 'dnf' as 'make install' does not do it, but
> > @@ -66,6
> > +68,12 @@ do_install_append_class-native() {
> > RPM_NO_CHROOT_FOR_SCRIPTS=1 }
> >
> > +do_install_append_class-nativesdk() {
> > +create_wrapper ${D}/${bindir}/dnf \
> > +RPM_CONFIGDIR=${SDKPATHNATIVE}${libdir_nativesdk}/rpm \
> > +RPM_NO_CHROOT_FOR_SCRIPTS=1 }
> > +
> > SYSTEMD_SERVICE_${PN} = "dnf-makecache.service dnf-makecache.timer \
> > dnf-automatic.service dnf-automatic.timer \
> > dnf-automatic-download.service
> > dnf-automatic-download.timer \
> > --
> > 1.8.3.1
>
>
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in toolchain
ping
--
Zheng Ruoqin
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
ADDR.: No.6 Wenzhu Road, Software Avenue,
Nanjing, 210012, China
MAIL : zhengrq.f...@cn.fujistu.com
> -Original Message-
> From: Zheng, Ruoqin/郑 若钦
> Sent: Saturday, April 13, 2019 10:37 PM
> To: openembedded-core@lists.openembedded.org
> Cc: Zheng, Ruoqin/郑 若钦
> Subject: [OE-core][PATCH] toolchain-scripts: make rpm work in toolchain
>
> Rpm need to read the arch info, but $script did not provide it, so add it.
>
> Signed-off-by: Zheng Ruoqin
> ---
> meta/classes/toolchain-scripts.bbclass | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-
> scripts.bbclass
> index 1a2ec4f..de50b7e 100644
> --- a/meta/classes/toolchain-scripts.bbclass
> +++ b/meta/classes/toolchain-scripts.bbclass
> @@ -101,6 +101,7 @@ toolchain_shared_env_script () {
> echo 'export CPPFLAGS="${TARGET_CPPFLAGS}"' >> $script
> echo 'export KCFLAGS="--sysroot=$SDKTARGETSYSROOT"' >> $script
> echo 'export OECORE_DISTRO_VERSION="${DISTRO_VERSION}"' >>
> $script
> + echo 'export MACHINE_ARCH=${MACHINE_ARCH}' >> $script
> echo 'export OECORE_SDK_VERSION="${SDK_VERSION}"' >> $script
> echo 'export ARCH=${ARCH}' >> $script
> echo 'export CROSS_COMPILE=${TARGET_PREFIX}' >> $script
> --
> 1.8.3.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] dnf: Enable nativesdk
Ping
--
Zheng Ruoqin
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
ADDR.: No.6 Wenzhu Road, Software Avenue,
Nanjing, 210012, China
MAIL : zhengrq.f...@cn.fujistu.com
> -Original Message-
> From: Zheng, Ruoqin/郑 若钦
> Sent: Saturday, April 13, 2019 10:36 PM
> To: openembedded-core@lists.openembedded.org
> Cc: Zheng, Ruoqin/郑 若钦
> Subject: [OE-core] [PATCH v2] dnf: Enable nativesdk
>
> Make dnf work on nativesdk environment.
>
> Signed-off-by: Zheng Ruoqin
> ---
> meta/recipes-devtools/dnf/dnf_4.1.0.bb | 10 +-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-devtools/dnf/dnf_4.1.0.bb b/meta/recipes-
> devtools/dnf/dnf_4.1.0.bb
> index d45023e..8b4291a 100644
> --- a/meta/recipes-devtools/dnf/dnf_4.1.0.bb
> +++ b/meta/recipes-devtools/dnf/dnf_4.1.0.bb
> @@ -26,7 +26,7 @@ EXTRA_OECMAKE = " -DWITH_MAN=0 -
> DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -
>
> BBCLASSEXTEND = "native nativesdk"
>
> -RDEPENDS_${PN}_class-target += " \
> +RDEPENDS_${PN} += " \
>python3-core \
>python3-codecs \
>python3-netclient \
> @@ -49,6 +49,8 @@ RDEPENDS_${PN}_class-target += " \
>python3-gpg \
>"
>
> +RDEPENDS_${PN}_class-native = ""
> +
> RRECOMMENDS_${PN}_class-target += "gnupg"
>
> # Create a symlink called 'dnf' as 'make install' does not do it, but @@
> -66,6
> +68,12 @@ do_install_append_class-native() {
> RPM_NO_CHROOT_FOR_SCRIPTS=1 }
>
> +do_install_append_class-nativesdk() {
> +create_wrapper ${D}/${bindir}/dnf \
> +RPM_CONFIGDIR=${SDKPATHNATIVE}${libdir_nativesdk}/rpm \
> +RPM_NO_CHROOT_FOR_SCRIPTS=1 }
> +
> SYSTEMD_SERVICE_${PN} = "dnf-makecache.service dnf-makecache.timer \
> dnf-automatic.service dnf-automatic.timer \
> dnf-automatic-download.service
> dnf-automatic-download.timer \
> --
> 1.8.3.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] toolchain-scripts: make rpm work in toolchain
Rpm need to read the arch info, but $script did not provide it, so add it.
Signed-off-by: Zheng Ruoqin
---
meta/classes/toolchain-scripts.bbclass | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/classes/toolchain-scripts.bbclass
b/meta/classes/toolchain-scripts.bbclass
index 1a2ec4f..de50b7e 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -101,6 +101,7 @@ toolchain_shared_env_script () {
echo 'export CPPFLAGS="${TARGET_CPPFLAGS}"' >> $script
echo 'export KCFLAGS="--sysroot=$SDKTARGETSYSROOT"' >> $script
echo 'export OECORE_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
+ echo 'export MACHINE_ARCH=${MACHINE_ARCH}' >> $script
echo 'export OECORE_SDK_VERSION="${SDK_VERSION}"' >> $script
echo 'export ARCH=${ARCH}' >> $script
echo 'export CROSS_COMPILE=${TARGET_PREFIX}' >> $script
--
1.8.3.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] dnf: Enable nativesdk
Make dnf work on nativesdk environment.
Signed-off-by: Zheng Ruoqin
---
meta/recipes-devtools/dnf/dnf_4.1.0.bb | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/dnf/dnf_4.1.0.bb
b/meta/recipes-devtools/dnf/dnf_4.1.0.bb
index d45023e..8b4291a 100644
--- a/meta/recipes-devtools/dnf/dnf_4.1.0.bb
+++ b/meta/recipes-devtools/dnf/dnf_4.1.0.bb
@@ -26,7 +26,7 @@ EXTRA_OECMAKE = " -DWITH_MAN=0
-DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -
BBCLASSEXTEND = "native nativesdk"
-RDEPENDS_${PN}_class-target += " \
+RDEPENDS_${PN} += " \
python3-core \
python3-codecs \
python3-netclient \
@@ -49,6 +49,8 @@ RDEPENDS_${PN}_class-target += " \
python3-gpg \
"
+RDEPENDS_${PN}_class-native = ""
+
RRECOMMENDS_${PN}_class-target += "gnupg"
# Create a symlink called 'dnf' as 'make install' does not do it, but
@@ -66,6 +68,12 @@ do_install_append_class-native() {
RPM_NO_CHROOT_FOR_SCRIPTS=1
}
+do_install_append_class-nativesdk() {
+create_wrapper ${D}/${bindir}/dnf \
+RPM_CONFIGDIR=${SDKPATHNATIVE}${libdir_nativesdk}/rpm \
+RPM_NO_CHROOT_FOR_SCRIPTS=1
+}
+
SYSTEMD_SERVICE_${PN} = "dnf-makecache.service dnf-makecache.timer \
dnf-automatic.service dnf-automatic.timer \
dnf-automatic-download.service
dnf-automatic-download.timer \
--
1.8.3.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] dnf: Enable nativesdk
Hi Alex:
> > echo 'export OECORE_DISTRO_VERSION="${DISTRO_VERSION}"' >>
> > $script
> > + echo 'export MACHINE_ARCH=${MACHINE_ARCH}' >> $script
> > Please explain why this change in the commit.
Dnf is based on rpm and rpm need to read the arch info, but $script did not
provide it. So I added it.
> > Do not copy-paste large chunks like this please. Assign the
> > dependencies to a variable, and use it where needed.
If so, how about this way?
BBCLASSEXTEND = "native nativesdk"
RDEPENDS_${PN} += " \
python3-core \
..
"
RDEPENDS_${PN}_class-native = ""
--
Zheng Ruoqin
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
ADDR.: No.6 Wenzhu Road, Software Avenue,
Nanjing, 210012, China
MAIL : zhengrq.f...@cn.fujistu.com
> -Original Message-
> From: Alexander Kanavin [mailto:alex.kana...@gmail.com]
> Sent: Thursday, April 11, 2019 7:19 PM
> To: Zheng, Ruoqin/郑 若钦
> Cc: OE-core
> Subject: Re: [OE-core] [PATCH] dnf: Enable nativesdk
>
> On Thu, 11 Apr 2019 at 08:13, Zheng Ruoqin
> wrote:
>
> > --- a/meta/classes/toolchain-scripts.bbclass
> > +++ b/meta/classes/toolchain-scripts.bbclass
> > @@ -101,6 +101,7 @@ toolchain_shared_env_script () {
> > echo 'export CPPFLAGS="${TARGET_CPPFLAGS}"' >> $script
> > echo 'export KCFLAGS="--sysroot=$SDKTARGETSYSROOT"' >> $script
> > echo 'export OECORE_DISTRO_VERSION="${DISTRO_VERSION}"' >>
> > $script
> > + echo 'export MACHINE_ARCH=${MACHINE_ARCH}' >> $script
>
> Please explain why this change in the commit.
>
> > +RDEPENDS_${PN}_class-nativesdk += " \
> > + python3-core \
> > + python3-codecs \
> > + python3-netclient \
> > + python3-email \
> > + python3-threading \
> > + python3-distutils \
> > + python3-logging \
> > + python3-fcntl \
> > + librepo \
> > + python3-shell \
> > + libcomps \
> > + libdnf \
> > + python3-sqlite3 \
> > + python3-compression \
> > + python3-rpm \
> > + python3-iniparse \
> > + python3-json \
> > + python3-curses \
> > + python3-misc \
> > + python3-gpg \
> > + "
> > +
> > RRECOMMENDS_${PN}_class-target += "gnupg"
>
> Do not copy-paste large chunks like this please. Assign the dependencies to a
> variable, and use it where needed.
>
> Alex
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] dnf: Enable nativesdk
Make dnf work on nativesdk environment.
Signed-off-by: Zheng Ruoqin
---
meta/classes/toolchain-scripts.bbclass | 1 +
meta/recipes-devtools/dnf/dnf_4.1.0.bb | 29 +
2 files changed, 30 insertions(+)
diff --git a/meta/classes/toolchain-scripts.bbclass
b/meta/classes/toolchain-scripts.bbclass
index 1a2ec4f..de50b7e 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -101,6 +101,7 @@ toolchain_shared_env_script () {
echo 'export CPPFLAGS="${TARGET_CPPFLAGS}"' >> $script
echo 'export KCFLAGS="--sysroot=$SDKTARGETSYSROOT"' >> $script
echo 'export OECORE_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
+ echo 'export MACHINE_ARCH=${MACHINE_ARCH}' >> $script
echo 'export OECORE_SDK_VERSION="${SDK_VERSION}"' >> $script
echo 'export ARCH=${ARCH}' >> $script
echo 'export CROSS_COMPILE=${TARGET_PREFIX}' >> $script
diff --git a/meta/recipes-devtools/dnf/dnf_4.1.0.bb
b/meta/recipes-devtools/dnf/dnf_4.1.0.bb
index d45023e..a5bded0 100644
--- a/meta/recipes-devtools/dnf/dnf_4.1.0.bb
+++ b/meta/recipes-devtools/dnf/dnf_4.1.0.bb
@@ -49,6 +49,29 @@ RDEPENDS_${PN}_class-target += " \
python3-gpg \
"
+RDEPENDS_${PN}_class-nativesdk += " \
+ python3-core \
+ python3-codecs \
+ python3-netclient \
+ python3-email \
+ python3-threading \
+ python3-distutils \
+ python3-logging \
+ python3-fcntl \
+ librepo \
+ python3-shell \
+ libcomps \
+ libdnf \
+ python3-sqlite3 \
+ python3-compression \
+ python3-rpm \
+ python3-iniparse \
+ python3-json \
+ python3-curses \
+ python3-misc \
+ python3-gpg \
+ "
+
RRECOMMENDS_${PN}_class-target += "gnupg"
# Create a symlink called 'dnf' as 'make install' does not do it, but
@@ -66,6 +89,12 @@ do_install_append_class-native() {
RPM_NO_CHROOT_FOR_SCRIPTS=1
}
+do_install_append_class-nativesdk() {
+create_wrapper ${D}/${bindir}/dnf \
+RPM_CONFIGDIR=${SDKPATHNATIVE}${libdir_nativesdk}/rpm \
+RPM_NO_CHROOT_FOR_SCRIPTS=1
+}
+
SYSTEMD_SERVICE_${PN} = "dnf-makecache.service dnf-makecache.timer \
dnf-automatic.service dnf-automatic.timer \
dnf-automatic-download.service
dnf-automatic-download.timer \
--
1.8.3.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] sanity: check_perl_modules bug fix
Fix Python3 TypeError error in check_perl_modules: Executing bitbake, the following error message will be throwed: File ".../poky/meta/classes/sanity.bbclass", line 979, in check_sanity_eventhandler check_sanity(sanity_data) File ".../poky/meta/classes/sanity.bbclass", line 943, in check_sanity check_sanity_version_change(status, sanity_data) File ".../poky/meta/classes/sanity.bbclass", line 637, in check_sanity_version_change status.addresult(check_perl_modules(d)) File ".../poky/meta/classes/sanity.bbclass", line 563, in check_perl_modules errresult += e.output TypeError: must be str, not bytes So here, transfer e.output from bytes to str. Signed-off-by: Zheng Ruoqin --- meta/classes/sanity.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 4cbb1f3..9429202 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -560,7 +560,7 @@ def check_perl_modules(sanity_data): try: subprocess.check_output(["perl", "-e", "use %s" % m]) except subprocess.CalledProcessError as e: -errresult += e.output +errresult += bytes.decode(e.output) ret += "%s " % m if ret: return "Required perl module(s) not found: %s\n\n%s\n" % (ret, errresult) -- 1.8.3.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] createrepo-c: fix for do_package_qa
Hi Ross： Just work around. Now I don't know why does createrepo-c depend on python3-dev. -- Zheng Ruoqin Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) ADDR.: No.6 Wenzhu Road, Software Avenue, Nanjing, 210012, China MAIL : zhengrq.f...@cn.fujistu.com > -Original Message- > From: Burton, Ross [mailto:ross.bur...@intel.com] > Sent: Tuesday, March 12, 2019 6:30 PM > To: Zheng, Ruoqin/郑 若钦 > Cc: OE-core > Subject: Re: [OE-core] [PATCH] createrepo-c: fix for do_package_qa > > On Tue, 12 Mar 2019 at 03:05, Zheng Ruoqin > wrote: > > Fix the following QA Issue: > > > > ERROR: nativesdk-createrepo-c-0.12.1-r0 do_package_qa: QA Issue: nativesdk- > createrepo-c rdepends on nativesdk-python3-dev [dev-deps] > > ERROR: nativesdk-createrepo-c-0.12.1-r0 do_package_qa: QA run found fatal > errors. Please consider fixing them. > > Fixing or working around? Why does createrepo-c depend on python3-dev? > > Ross > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] createrepo-c: fix for do_package_qa
Fix the following QA Issue:
ERROR: nativesdk-createrepo-c-0.12.1-r0 do_package_qa: QA Issue:
nativesdk-createrepo-c rdepends on nativesdk-python3-dev [dev-deps]
ERROR: nativesdk-createrepo-c-0.12.1-r0 do_package_qa: QA run found fatal
errors. Please consider fixing them.
Signed-off-by: Zheng Ruoqin
---
meta/recipes-devtools/createrepo-c/createrepo-c_git.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
b/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
index 9aa8d2a..e11a783 100644
--- a/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
+++ b/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
@@ -33,3 +33,5 @@ do_install_append_class-nativesdk() {
RPM_CONFIGDIR=${SDKPATHNATIVE}${libdir_nativesdk}/rpm
rm -rf ${D}/etc
}
+
+INSANE_SKIP_${PN} += "dev-deps"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2][thud] mdadm: add init and service scripts
Add init script and service file for sysvinit and systemd.
Signed-off-by: Zheng Ruoqin
Signed-off-by: Hong Liu
---
meta/recipes-extended/mdadm/files/mdadm.init | 72 ++
.../recipes-extended/mdadm/files/mdmonitor.service | 19 ++
meta/recipes-extended/mdadm/mdadm_4.0.bb | 17 -
3 files changed, 106 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-extended/mdadm/files/mdadm.init
create mode 100644 meta/recipes-extended/mdadm/files/mdmonitor.service
diff --git a/meta/recipes-extended/mdadm/files/mdadm.init
b/meta/recipes-extended/mdadm/files/mdadm.init
new file mode 100644
index 000..cab91b9
--- /dev/null
+++ b/meta/recipes-extended/mdadm/files/mdadm.init
@@ -0,0 +1,72 @@
+#!/bin/sh
+#
+# Start the MD monitor daemon for all active MD arrays if desired.
+#
+### BEGIN INIT INFO
+# Provides: mdadm
+# Required-Start:$local_fs $syslog mdadm-raid
+# Required-Stop: $local_fs $syslog mdadm-raid
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: MD monitoring daemon
+# Description: mdadm provides a monitor mode, in which it will scan for
+#problems with the MD devices. If a problem is found, the
+#administrator is alerted via email, or a custom script is
+#run.
+### END INIT INFO
+#
+
+MDADM=/sbin/mdadm
+RUNDIR=/var/run/mdadm
+PIDFILE=$RUNDIR/monitor.pid
+DEBIANCONFIG=/etc/default/mdadm
+
+test -x "$MDADM" || exit 0
+
+test -f /proc/mdstat || exit 0
+
+START_DAEMON=true
+test -f $DEBIANCONFIG && . $DEBIANCONFIG
+
+. /lib/lsb/init-functions
+
+# Include functions
+. /etc/init.d/functions
+
+case "${1:-}" in
+ start)
+if is_true $START_DAEMON; then
+ log_daemon_msg "Starting MD monitoring service" "mdadm --monitor"
+ mkdir -p $RUNDIR
+ start-stop-daemon -S -p $PIDFILE -x $MDADM -- \
+--monitor --pid-file $PIDFILE --daemonise --scan ${DAEMON_OPTIONS:-}
+ RETVAL=$?
+ log_end_msg $RETVAL
+ exit $RETVAL
+fi
+;;
+ stop)
+if [ -f $PIDFILE ] ; then
+ log_daemon_msg "Stopping MD monitoring service" "mdadm --monitor"
+ start-stop-daemon -K -p $PIDFILE -x $MDADM
+ RETVAL=$?
+ rm -f $PIDFILE
+ log_end_msg $RETVAL
+ exit $RETVAL
+fi
+;;
+ status)
+status -p $PIDFILE "$MDADM" && exit 0 || exit $?
+;;
+ restart|reload|force-reload)
+${0:-} stop
+${0:-} start
+;;
+ *)
+echo "Usage: ${0:-} {start|stop|status|restart|reload|force-reload}" >&2
+exit 1
+;;
+esac
+
+exit 0
+
diff --git a/meta/recipes-extended/mdadm/files/mdmonitor.service
b/meta/recipes-extended/mdadm/files/mdmonitor.service
new file mode 100644
index 000..bd243b4
--- /dev/null
+++ b/meta/recipes-extended/mdadm/files/mdmonitor.service
@@ -0,0 +1,19 @@
+# This file is part of mdadm.
+#
+# mdadm is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+[Unit]
+Description=Software RAID monitoring and management
+ConditionPathExists=/etc/mdadm.conf
+
+[Service]
+Type=forking
+PIDFile=/var/run/mdadm/mdadm.pid
+EnvironmentFile=-/etc/sysconfig/mdmonitor
+ExecStart=/sbin/mdadm --monitor --scan -f --pid-file=/var/run/mdadm/mdadm.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-extended/mdadm/mdadm_4.0.bb
b/meta/recipes-extended/mdadm/mdadm_4.0.bb
index 2c4d88a..8155ae4 100644
--- a/meta/recipes-extended/mdadm/mdadm_4.0.bb
+++ b/meta/recipes-extended/mdadm/mdadm_4.0.bb
@@ -24,12 +24,14 @@ SRC_URI =
"${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \
file://0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch \
file://0001-use-memmove-instead-of-memcpy-on-overlapping-region.patch \
file://0001-Disable-gcc8-warnings.patch \
+ file://mdadm.init \
+ file://mdmonitor.service \
"
SRC_URI[md5sum] = "2cb4feffea9167ba71b5f346a0c0a40d"
SRC_URI[sha256sum] =
"1d6ae7f24ced3a0fa7b5613b32f4a589bb4881e3946a5a2c3724056254ada3a9"
CFLAGS += "-fno-strict-aliasing"
-inherit autotools-brokensep
+inherit autotools-brokensep systemd
EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}"'
# PPC64 and MIPS64 uses long long for u64 in the kernel, but powerpc's
asm/types.h
@@ -51,7 +53,17 @@ do_install() {
autotools_do_install
}
-inherit ptest
+do_install_append() {
+install -d ${D}/${sysconfdir}/
+install -m 644 ${S}/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf
+install -d ${D}/${systemd_unitdir}/system
+install -m 644 ${S}/systemd/mdmonitor.service
${D}/${systemd_unitdir}/system
+install -d $
[OE-core] [PATCH v2] mdadm: add init and service scripts
Add init script and service file for sysvinit and systemd.
Signed-off-by: Zheng Ruoqin
Signed-off-by: Hong Liu
---
meta/recipes-extended/mdadm/files/mdadm.init | 72 ++
.../recipes-extended/mdadm/files/mdmonitor.service | 19 ++
meta/recipes-extended/mdadm/mdadm_4.1.bb | 16 -
3 files changed, 106 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-extended/mdadm/files/mdadm.init
create mode 100644 meta/recipes-extended/mdadm/files/mdmonitor.service
diff --git a/meta/recipes-extended/mdadm/files/mdadm.init
b/meta/recipes-extended/mdadm/files/mdadm.init
new file mode 100644
index 000..cab91b9
--- /dev/null
+++ b/meta/recipes-extended/mdadm/files/mdadm.init
@@ -0,0 +1,72 @@
+#!/bin/sh
+#
+# Start the MD monitor daemon for all active MD arrays if desired.
+#
+### BEGIN INIT INFO
+# Provides: mdadm
+# Required-Start:$local_fs $syslog mdadm-raid
+# Required-Stop: $local_fs $syslog mdadm-raid
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: MD monitoring daemon
+# Description: mdadm provides a monitor mode, in which it will scan for
+#problems with the MD devices. If a problem is found, the
+#administrator is alerted via email, or a custom script is
+#run.
+### END INIT INFO
+#
+
+MDADM=/sbin/mdadm
+RUNDIR=/var/run/mdadm
+PIDFILE=$RUNDIR/monitor.pid
+DEBIANCONFIG=/etc/default/mdadm
+
+test -x "$MDADM" || exit 0
+
+test -f /proc/mdstat || exit 0
+
+START_DAEMON=true
+test -f $DEBIANCONFIG && . $DEBIANCONFIG
+
+. /lib/lsb/init-functions
+
+# Include functions
+. /etc/init.d/functions
+
+case "${1:-}" in
+ start)
+if is_true $START_DAEMON; then
+ log_daemon_msg "Starting MD monitoring service" "mdadm --monitor"
+ mkdir -p $RUNDIR
+ start-stop-daemon -S -p $PIDFILE -x $MDADM -- \
+--monitor --pid-file $PIDFILE --daemonise --scan ${DAEMON_OPTIONS:-}
+ RETVAL=$?
+ log_end_msg $RETVAL
+ exit $RETVAL
+fi
+;;
+ stop)
+if [ -f $PIDFILE ] ; then
+ log_daemon_msg "Stopping MD monitoring service" "mdadm --monitor"
+ start-stop-daemon -K -p $PIDFILE -x $MDADM
+ RETVAL=$?
+ rm -f $PIDFILE
+ log_end_msg $RETVAL
+ exit $RETVAL
+fi
+;;
+ status)
+status -p $PIDFILE "$MDADM" && exit 0 || exit $?
+;;
+ restart|reload|force-reload)
+${0:-} stop
+${0:-} start
+;;
+ *)
+echo "Usage: ${0:-} {start|stop|status|restart|reload|force-reload}" >&2
+exit 1
+;;
+esac
+
+exit 0
+
diff --git a/meta/recipes-extended/mdadm/files/mdmonitor.service
b/meta/recipes-extended/mdadm/files/mdmonitor.service
new file mode 100644
index 000..bd243b4
--- /dev/null
+++ b/meta/recipes-extended/mdadm/files/mdmonitor.service
@@ -0,0 +1,19 @@
+# This file is part of mdadm.
+#
+# mdadm is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+[Unit]
+Description=Software RAID monitoring and management
+ConditionPathExists=/etc/mdadm.conf
+
+[Service]
+Type=forking
+PIDFile=/var/run/mdadm/mdadm.pid
+EnvironmentFile=-/etc/sysconfig/mdmonitor
+ExecStart=/sbin/mdadm --monitor --scan -f --pid-file=/var/run/mdadm/mdadm.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-extended/mdadm/mdadm_4.1.bb
b/meta/recipes-extended/mdadm/mdadm_4.1.bb
index 7663a6b..2d7ade6 100644
--- a/meta/recipes-extended/mdadm/mdadm_4.1.bb
+++ b/meta/recipes-extended/mdadm/mdadm_4.1.bb
@@ -17,11 +17,16 @@ SRC_URI =
"${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \
file://0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch \
file://0001-Compute-abs-diff-in-a-standard-compliant-way.patch \
file://0001-fix-gcc-8-format-truncation-warning.patch \
+ file://mdadm.init \
+ file://mdmonitor.service \
"
SRC_URI[md5sum] = "51bf3651bd73a06c413a2f964f299598"
SRC_URI[sha256sum] =
"ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a"
-inherit autotools-brokensep ptest
+inherit autotools-brokensep ptest systemd
+
+SYSTEMD_SERVICE_${PN} = "mdmonitor.service"
+SYSTEMD_AUTO_ENABLE = "disable"
CFLAGS_append_toolchain-clang = " -Wno-error=address-of-packed-member"
@@ -46,6 +51,15 @@ do_install() {
autotools_do_install
}
+do_install_append() {
+install -d ${D}/${sysconfdir}/
+install -m 644 ${S}/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf
+install -d ${D}/${systemd_unitdir}/system
+install -m 644 ${WORKDIR}/mdmonitor.service
${D}/${systemd_unitdir}/system
+insta
[OE-core] question：glib-2.0: dependence problem
Hi All:
I found an dependence problem for libglib-2.0-ptest package.
1. Dnf error message:
Error:
Problem 1: conflicting requests
- nothing provides locale-base-de-de needed by
libglib-2.0-ptest-1:2.58.0-r0.x86_64
2. In ./recipes-core/glib-2.0/glib.inc, it defines RDEPENDS includes
locale-base-es-es
RDEPENDS_${PN}-ptest_append_libc-glibc = "..
locale-base-de-de "
But glibc-locale didn't provide a package called " locale-base-de-de ", does
anyone know the reason?
----------
Zheng Ruoqin
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
ADDR.: No.6 Wenzhu Road, Software Avenue,
Nanjing, 210012, China
MAIL : zhengrq.f...@cn.fujistu.com
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [thud][PATCH v2] createrepo-c: Fix setup of logging (log domains)
Hi Ross This patch is just for thud. -- Zheng Ruoqin Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) ADDR.: No.6 Wenzhu Road, Software Avenue, Nanjing, 210012, China MAIL : zhengrq.f...@cn.fujistu.com > -Original Message- > From: Burton, Ross [mailto:ross.bur...@intel.com] > Sent: Friday, December 21, 2018 10:04 PM > To: Zheng, Ruoqin/郑 若钦 > Cc: OE-core > Subject: Re: [OE-core] [thud][PATCH v2] createrepo-c: Fix setup of logging > (log > domains) > > On Fri, 21 Dec 2018 at 09:19, Zheng, Ruoqin > wrote: > > Well, createrepo-c 0.12 has fixed this bug, and will this upgrade be merged > > to > thud branch? > > The upgrade won't be merged unless its critical, so please submit your patch > for > thud. > > Ross > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [thud][PATCH v2] createrepo-c: Fix setup of logging (log domains)
Hi Ross：
Well, createrepo-c 0.12 has fixed this bug, and will this upgrade be merged to
thud branch?
--
Zheng Ruoqin
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
ADDR.: No.6 Wenzhu Road, Software Avenue,
Nanjing, 210012, China
MAIL : zhengrq.f...@cn.fujistu.com
> -Original Message-
> From: Burton, Ross [mailto:ross.bur...@intel.com]
> Sent: Wednesday, December 19, 2018 7:18 PM
> To: Zheng, Ruoqin/郑 若钦
> Cc: OE-core
> Subject: Re: [OE-core] [thud][PATCH v2] createrepo-c: Fix setup of logging
> (log
> domains)
>
> There's an upgrade for createrepo-c on the list, does that supersede this
> patch?
>
> Ross
> On Wed, 19 Dec 2018 at 07:12, Zheng, Ruoqin
> wrote:
> >
> > Ping
> >
> > --
> > Zheng Ruoqin
> > Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
> > ADDR.: No.6 Wenzhu Road, Software Avenue,
> >Nanjing, 210012, China
> > MAIL : zhengrq.f...@cn.fujistu.com
> >
> >
> > > -Original Message-
> > > From: Zheng, Ruoqin/郑 若钦
> > > Sent: Tuesday, December 11, 2018 6:57 PM
> > > To: openembedded-core@lists.openembedded.org
> > > Cc: Zheng, Ruoqin/郑 若钦
> > > Subject: [OE-core][thud][PATCH v2] createrepo-c: Fix setup of
> > > logging (log
> > > domains)
> > >
> > > New debug messages were added into GLib library. These messages come
> > > from the "GLib" log domain and were not hidden in the standard and
> > > quiet mode of the application.
> > > This fix hides log messages regardless on source log domain.
> > >
> > > Backport from 80810f04f2de6bae6e394f52ad9cdd2189862f74.
> > >
> > > Signed-off-by: Zheng Ruoqin
> > > ---
> > > ...etup-of-logging-log-domains-RhBug-1645897.patch | 73
> > > ++
> > > .../createrepo-c/createrepo-c_git.bb | 1 +
> > > 2 files changed, 74 insertions(+)
> > > create mode 100644
> > > meta/recipes-devtools/createrepo-c/createrepo-c/0001-
> > > Fix-setup-of-logging-log-domains-RhBug-1645897.patch
> > >
> > > diff --git
> > > a/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Fix-setup-of-
> > > logging-log-domains-RhBug-1645897.patch
> > > b/meta/recipes-devtools/createrepo-
> > > c/createrepo-c/0001-Fix-setup-of-logging-log-domains-RhBug-1645897.p
> > > atch
> > > new file mode 100644
> > > index 000..6de9c05
> > > --- /dev/null
> > > +++ b/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Fix-setup
> > > +++ -of- logging-log-domains-RhBug-1645897.patch
> > > @@ -0,0 +1,73 @@
> > > +From 80810f04f2de6bae6e394f52ad9cdd2189862f74 Mon Sep 17 00:00:00
> > > +2001
> > > +From: Jaroslav Rohel
> > > +Date: Fri, 9 Nov 2018 07:35:13 +0100
> > > +Subject: [PATCH] Fix setup of logging (log domains) (RhBug:1645897)
> > > +
> > > +New debug messages were added into GLib library. These messages
> > > +come from the "GLib" log domain and were not hidden in the standard
> > > +and quiet mode of the application.
> > > +This fix hides log messages regardless on source log domain.
> > > +
> > > +Upstream-Status: Backport
> > > +
> > > +Signed-off-by: Zheng Ruoqin
> > > +---
> > > + src/createrepo_shared.c | 19 ++-
> > > + src/misc.c | 5 -
> > > + 2 files changed, 10 insertions(+), 14 deletions(-)
> > > +
> > > +diff --git a/src/createrepo_shared.c b/src/createrepo_shared.c
> > > +index
> > > +8a26787..7cb8ba8 100644
> > > +--- a/src/createrepo_shared.c
> > > b/src/createrepo_shared.c
> > > +@@ -270,24 +270,17 @@ cr_lock_repo(const gchar *repo_dir, void
> > > +cr_setup_logging(gboolean quiet, gboolean verbose) {
> > > +-g_log_set_default_handler (cr_log_fn, NULL);
> > > +-
> > > + if (quiet) {
> > > + // Quiet mode
> > > +-GLogLevelFlags levels = G_LOG_LEVEL_MESSAGE |
> G_LOG_LEVEL_INFO |
> > > +-G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_WARNING;
> > > +-g_log_set_handler(NULL, levels, cr_null_log_fn, NULL);
> > > +-g_log_set_handler("C_CREATEREPOLIB", levels, cr_null_log_fn,
> > > NULL);
> > > ++GLogLevelFlags hidden_levels = G_LOG_LEVEL_MESSAGE |
> > > G_LOG_LEVEL_INFO |
>
Re: [OE-core] [thud][PATCH v2] createrepo-c: Fix setup of logging (log domains)
Ping
--
Zheng Ruoqin
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
ADDR.: No.6 Wenzhu Road, Software Avenue,
Nanjing, 210012, China
MAIL : zhengrq.f...@cn.fujistu.com
> -Original Message-
> From: Zheng, Ruoqin/郑 若钦
> Sent: Tuesday, December 11, 2018 6:57 PM
> To: openembedded-core@lists.openembedded.org
> Cc: Zheng, Ruoqin/郑 若钦
> Subject: [OE-core][thud][PATCH v2] createrepo-c: Fix setup of logging (log
> domains)
>
> New debug messages were added into GLib library. These messages come from
> the "GLib" log domain and were not hidden in the standard and quiet mode of
> the application.
> This fix hides log messages regardless on source log domain.
>
> Backport from 80810f04f2de6bae6e394f52ad9cdd2189862f74.
>
> Signed-off-by: Zheng Ruoqin
> ---
> ...etup-of-logging-log-domains-RhBug-1645897.patch | 73
> ++
> .../createrepo-c/createrepo-c_git.bb | 1 +
> 2 files changed, 74 insertions(+)
> create mode 100644 meta/recipes-devtools/createrepo-c/createrepo-c/0001-
> Fix-setup-of-logging-log-domains-RhBug-1645897.patch
>
> diff --git
> a/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Fix-setup-of-
> logging-log-domains-RhBug-1645897.patch b/meta/recipes-devtools/createrepo-
> c/createrepo-c/0001-Fix-setup-of-logging-log-domains-RhBug-1645897.patch
> new file mode 100644
> index 000..6de9c05
> --- /dev/null
> +++ b/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Fix-setup-of-
> +++ logging-log-domains-RhBug-1645897.patch
> @@ -0,0 +1,73 @@
> +From 80810f04f2de6bae6e394f52ad9cdd2189862f74 Mon Sep 17 00:00:00 2001
> +From: Jaroslav Rohel
> +Date: Fri, 9 Nov 2018 07:35:13 +0100
> +Subject: [PATCH] Fix setup of logging (log domains) (RhBug:1645897)
> +
> +New debug messages were added into GLib library. These messages come
> +from the "GLib" log domain and were not hidden in the standard and
> +quiet mode of the application.
> +This fix hides log messages regardless on source log domain.
> +
> +Upstream-Status: Backport
> +
> +Signed-off-by: Zheng Ruoqin
> +---
> + src/createrepo_shared.c | 19 ++-
> + src/misc.c | 5 -
> + 2 files changed, 10 insertions(+), 14 deletions(-)
> +
> +diff --git a/src/createrepo_shared.c b/src/createrepo_shared.c index
> +8a26787..7cb8ba8 100644
> +--- a/src/createrepo_shared.c
> b/src/createrepo_shared.c
> +@@ -270,24 +270,17 @@ cr_lock_repo(const gchar *repo_dir, void
> +cr_setup_logging(gboolean quiet, gboolean verbose) {
> +-g_log_set_default_handler (cr_log_fn, NULL);
> +-
> + if (quiet) {
> + // Quiet mode
> +-GLogLevelFlags levels = G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO |
> +-G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_WARNING;
> +-g_log_set_handler(NULL, levels, cr_null_log_fn, NULL);
> +-g_log_set_handler("C_CREATEREPOLIB", levels, cr_null_log_fn, NULL);
> ++GLogLevelFlags hidden_levels = G_LOG_LEVEL_MESSAGE |
> G_LOG_LEVEL_INFO |
> ++ G_LOG_LEVEL_DEBUG |
> G_LOG_LEVEL_WARNING;
> ++g_log_set_default_handler (cr_log_fn,
> ++ GINT_TO_POINTER(hidden_levels));
> + } else if (verbose) {
> + // Verbose mode
> +-GLogLevelFlags levels = G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO |
> +-G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_WARNING;
> +-g_log_set_handler(NULL, levels, cr_log_fn, NULL);
> +-g_log_set_handler("C_CREATEREPOLIB", levels, cr_log_fn, NULL);
> ++g_log_set_default_handler (cr_log_fn, GINT_TO_POINTER(0));
> + } else {
> + // Standard mode
> +-GLogLevelFlags levels = G_LOG_LEVEL_DEBUG;
> +-g_log_set_handler(NULL, levels, cr_null_log_fn, NULL);
> +-g_log_set_handler("C_CREATEREPOLIB", levels, cr_null_log_fn, NULL);
> ++GLogLevelFlags hidden_levels = G_LOG_LEVEL_DEBUG;
> ++g_log_set_default_handler (cr_log_fn,
> ++ GINT_TO_POINTER(hidden_levels));
> + }
> + }
> +diff --git a/src/misc.c b/src/misc.c
> +index 9937480..9549a44 100644
> +--- a/src/misc.c
> b/src/misc.c
> +@@ -912,8 +912,11 @@ void
> + cr_log_fn(const gchar *log_domain,
> + GLogLevelFlags log_level,
> + const gchar *message,
> +- G_GNUC_UNUSED gpointer user_data)
> ++ gpointer user_data)
> + {
> ++gint hidden_log_levels = GPOINTER_TO_INT(user_data);
> ++if (log_level & hidden_log_levels)
> ++return;
> + switch(log_level) {
> + case G_LOG_LEVEL_ERROR:
> +
Re: [OE-core] [PATCH 1/4] nss: fix Upstream-Status format
Hi Ross: My patch has been merged by Upstream NSS: https://hg.mozilla.org/projects/nss/rev/66cae6a8f4b640bec5e8510dcfc247e0546c973c -- Zheng Ruoqin Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) ADDR.: No.6 Wenzhu Road, Software Avenue, Nanjing, 210012, China MAIL : zhengrq.f...@cn.fujistu.com > -Original Message- > From: openembedded-core-boun...@lists.openembedded.org > [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of > Ross Burton > Sent: Tuesday, December 11, 2018 1:12 AM > To: openembedded-core@lists.openembedded.org > Subject: [OE-core] [PATCH 1/4] nss: fix Upstream-Status format > > Signed-off-by: Ross Burton > --- > meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch | 2 > +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm- > 32be.patch b/meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm- > 32be.patch > index 7ba8d16483a..bb1c6e3b345 100644 > --- a/meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm- > 32be.patch > +++ b/meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm- > 32be.patch > @@ -2,7 +2,7 @@ Subject: [PATCH] Fix SHA_HTONL bug for arm 32be. > > In arm 32be, there is no need to reverse the host value. > > -Upstream Status: Pending > +Upstream-Status: Pending > > Signed-off-by: Zheng Ruoqin > --- > -- > 2.11.0 > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [thud][PATCH] nss: Fix SHA_HTONL bug for arm 32be.
Rpm use nss as digest crypto library and which will cause an error as follows:
error: test-manual-1.2.3-20181012.noarch.rpm: Header SHA1 digest: BAD (Expected
f1deb7dc4a10742d88ccd1e967dbc62ae45095a5
!=4ad9d7dad6d70d6086eefec62612ad5d77f2fe81) => this value is wrong
error: test-manual-1.2.3-20181012.noarch.rpm: not an rpm package (or package
manifest)
The error is caused by SHA_HTONL in nss, for there is no need to reverse the
host value for arm 32be, so fix it.
Signed-off-by: Zheng Ruoqin
---
.../nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch | 34 ++
meta/recipes-support/nss/nss_3.39.bb | 1 +
2 files changed, 35 insertions(+)
create mode 100644
meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch
diff --git
a/meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch
b/meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch
new file mode 100644
index 000..bb1c6e3
--- /dev/null
+++ b/meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch
@@ -0,0 +1,34 @@
+Subject: [PATCH] Fix SHA_HTONL bug for arm 32be.
+
+In arm 32be, there is no need to reverse the host value.
+
+Upstream-Status: Pending
+
+Signed-off-by: Zheng Ruoqin
+---
+ lib/freebl/sha_fast.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/nss/lib/freebl/sha_fast.h b/nss/lib/freebl/sha_fast.h
+index 4f37d13..8072eda 100644
+--- a/nss/lib/freebl/sha_fast.h
b/nss/lib/freebl/sha_fast.h
+@@ -99,6 +99,7 @@ swap4b(PRUint32 value)
+ defined(__ARM_ARCH_7__) || \
+ defined(__ARM_ARCH_7A__) || \
+ defined(__ARM_ARCH_7R__)))
++#if defined(IS_LITTLE_ENDIAN)
+ static __inline__ PRUint32
+ swap4b(PRUint32 value)
+ {
+@@ -109,6 +110,7 @@ swap4b(PRUint32 value)
+ return ret;
+ }
+ #define SHA_HTONL(x) swap4b(x)
++#endif
+
+ #endif /* x86 family */
+
+--
+2.7.4
+
diff --git a/meta/recipes-support/nss/nss_3.39.bb
b/meta/recipes-support/nss/nss_3.39.bb
index cdc95c6..3a8e5d4 100644
--- a/meta/recipes-support/nss/nss_3.39.bb
+++ b/meta/recipes-support/nss/nss_3.39.bb
@@ -28,6 +28,7 @@ SRC_URI =
"http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO
file://blank-cert9.db \
file://blank-key4.db \
file://system-pkcs11.txt \
+ file://nss-fix-SHA_HTONL-bug-for-arm-32be.patch \
"
SRC_URI[md5sum] = "10720fc70fd483de1b085402fb10ed59"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [sumo][PATCH] nss: Fix SHA_HTONL bug for arm 32be.
Rpm use nss as digest crypto library and which will cause an error as follows:
error: test-manual-1.2.3-20181012.noarch.rpm: Header SHA1 digest: BAD (Expected
f1deb7dc4a10742d88ccd1e967dbc62ae45095a5
!=4ad9d7dad6d70d6086eefec62612ad5d77f2fe81) => this value is wrong
error: test-manual-1.2.3-20181012.noarch.rpm: not an rpm package (or package
manifest)
The error is caused by SHA_HTONL in nss, for there is no need to reverse the
host value for arm 32be, so fix it.
Signed-off-by: Zheng Ruoqin
---
.../nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch | 34 ++
meta/recipes-support/nss/nss_3.35.bb | 1 +
2 files changed, 35 insertions(+)
create mode 100644
meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch
diff --git
a/meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch
b/meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch
new file mode 100644
index 000..bb1c6e3
--- /dev/null
+++ b/meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch
@@ -0,0 +1,34 @@
+Subject: [PATCH] Fix SHA_HTONL bug for arm 32be.
+
+In arm 32be, there is no need to reverse the host value.
+
+Upstream-Status: Pending
+
+Signed-off-by: Zheng Ruoqin
+---
+ lib/freebl/sha_fast.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/nss/lib/freebl/sha_fast.h b/nss/lib/freebl/sha_fast.h
+index 4f37d13..8072eda 100644
+--- a/nss/lib/freebl/sha_fast.h
b/nss/lib/freebl/sha_fast.h
+@@ -99,6 +99,7 @@ swap4b(PRUint32 value)
+ defined(__ARM_ARCH_7__) || \
+ defined(__ARM_ARCH_7A__) || \
+ defined(__ARM_ARCH_7R__)))
++#if defined(IS_LITTLE_ENDIAN)
+ static __inline__ PRUint32
+ swap4b(PRUint32 value)
+ {
+@@ -109,6 +110,7 @@ swap4b(PRUint32 value)
+ return ret;
+ }
+ #define SHA_HTONL(x) swap4b(x)
++#endif
+
+ #endif /* x86 family */
+
+--
+2.7.4
+
diff --git a/meta/recipes-support/nss/nss_3.35.bb
b/meta/recipes-support/nss/nss_3.35.bb
index 84f1916..cf7e17c 100644
--- a/meta/recipes-support/nss/nss_3.35.bb
+++ b/meta/recipes-support/nss/nss_3.35.bb
@@ -28,6 +28,7 @@ SRC_URI =
"http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO
file://Fix-compilation-for-X32.patch \
file://nss-build-hacl-poly1305-aarch64.patch \
file://0001-Bug-1437734-Use-snprintf-in-sign.c-r-ttaubert.patch \
+ file://nss-fix-SHA_HTONL-bug-for-arm-32be.patch \
"
SRC_URI[md5sum] = "9467ec9e65c5aeb3254a50250490f5f7"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] createrepo-c: Fix setup of logging (log domains)
New debug messages were added into GLib library. These messages come
from the "GLib" log domain and were not hidden in the standard and
quiet mode of the application.
This fix hides log messages regardless on source log domain.
Backport from 80810f04f2de6bae6e394f52ad9cdd2189862f74.
Signed-off-by: Zheng Ruoqin
---
...etup-of-logging-log-domains-RhBug-1645897.patch | 73 ++
.../createrepo-c/createrepo-c_git.bb | 1 +
2 files changed, 74 insertions(+)
create mode 100644
meta/recipes-devtools/createrepo-c/createrepo-c/0001-Fix-setup-of-logging-log-domains-RhBug-1645897.patch
diff --git
a/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Fix-setup-of-logging-log-domains-RhBug-1645897.patch
b/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Fix-setup-of-logging-log-domains-RhBug-1645897.patch
new file mode 100644
index 000..6de9c05
--- /dev/null
+++
b/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Fix-setup-of-logging-log-domains-RhBug-1645897.patch
@@ -0,0 +1,73 @@
+From 80810f04f2de6bae6e394f52ad9cdd2189862f74 Mon Sep 17 00:00:00 2001
+From: Jaroslav Rohel
+Date: Fri, 9 Nov 2018 07:35:13 +0100
+Subject: [PATCH] Fix setup of logging (log domains) (RhBug:1645897)
+
+New debug messages were added into GLib library. These messages come
+from the "GLib" log domain and were not hidden in the standard and
+quiet mode of the application.
+This fix hides log messages regardless on source log domain.
+
+Upstream-Status: Backport
+
+Signed-off-by: Zheng Ruoqin
+---
+ src/createrepo_shared.c | 19 ++-
+ src/misc.c | 5 -
+ 2 files changed, 10 insertions(+), 14 deletions(-)
+
+diff --git a/src/createrepo_shared.c b/src/createrepo_shared.c
+index 8a26787..7cb8ba8 100644
+--- a/src/createrepo_shared.c
b/src/createrepo_shared.c
+@@ -270,24 +270,17 @@ cr_lock_repo(const gchar *repo_dir,
+ void
+ cr_setup_logging(gboolean quiet, gboolean verbose)
+ {
+-g_log_set_default_handler (cr_log_fn, NULL);
+-
+ if (quiet) {
+ // Quiet mode
+-GLogLevelFlags levels = G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO |
+-G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_WARNING;
+-g_log_set_handler(NULL, levels, cr_null_log_fn, NULL);
+-g_log_set_handler("C_CREATEREPOLIB", levels, cr_null_log_fn, NULL);
++GLogLevelFlags hidden_levels = G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO
|
++ G_LOG_LEVEL_DEBUG |
G_LOG_LEVEL_WARNING;
++g_log_set_default_handler (cr_log_fn, GINT_TO_POINTER(hidden_levels));
+ } else if (verbose) {
+ // Verbose mode
+-GLogLevelFlags levels = G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO |
+-G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_WARNING;
+-g_log_set_handler(NULL, levels, cr_log_fn, NULL);
+-g_log_set_handler("C_CREATEREPOLIB", levels, cr_log_fn, NULL);
++g_log_set_default_handler (cr_log_fn, GINT_TO_POINTER(0));
+ } else {
+ // Standard mode
+-GLogLevelFlags levels = G_LOG_LEVEL_DEBUG;
+-g_log_set_handler(NULL, levels, cr_null_log_fn, NULL);
+-g_log_set_handler("C_CREATEREPOLIB", levels, cr_null_log_fn, NULL);
++GLogLevelFlags hidden_levels = G_LOG_LEVEL_DEBUG;
++g_log_set_default_handler (cr_log_fn, GINT_TO_POINTER(hidden_levels));
+ }
+ }
+diff --git a/src/misc.c b/src/misc.c
+index 9937480..9549a44 100644
+--- a/src/misc.c
b/src/misc.c
+@@ -912,8 +912,11 @@ void
+ cr_log_fn(const gchar *log_domain,
+ GLogLevelFlags log_level,
+ const gchar *message,
+- G_GNUC_UNUSED gpointer user_data)
++ gpointer user_data)
+ {
++gint hidden_log_levels = GPOINTER_TO_INT(user_data);
++if (log_level & hidden_log_levels)
++return;
+ switch(log_level) {
+ case G_LOG_LEVEL_ERROR:
+ if (log_domain) g_printerr("%s: ", log_domain);
+--
+1.8.3.1
+
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
b/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
index 2960811..08766b3 100644
--- a/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
+++ b/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRC_URI = "git://github.com/rpm-software-management/createrepo_c \
file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
file://0001-Correctly-install-the-shared-library.patch \
+ file://0001-Fix-setup-of-logging-log-domains-RhBug-1645897.patch \
"
PV = "0.11.1+git${SRCPV}"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [thud][PATCH v2] createrepo-c: Fix setup of logging (log domains)
New debug messages were added into GLib library. These messages come
from the "GLib" log domain and were not hidden in the standard and
quiet mode of the application.
This fix hides log messages regardless on source log domain.
Backport from 80810f04f2de6bae6e394f52ad9cdd2189862f74.
Signed-off-by: Zheng Ruoqin
---
...etup-of-logging-log-domains-RhBug-1645897.patch | 73 ++
.../createrepo-c/createrepo-c_git.bb | 1 +
2 files changed, 74 insertions(+)
create mode 100644
meta/recipes-devtools/createrepo-c/createrepo-c/0001-Fix-setup-of-logging-log-domains-RhBug-1645897.patch
diff --git
a/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Fix-setup-of-logging-log-domains-RhBug-1645897.patch
b/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Fix-setup-of-logging-log-domains-RhBug-1645897.patch
new file mode 100644
index 000..6de9c05
--- /dev/null
+++
b/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Fix-setup-of-logging-log-domains-RhBug-1645897.patch
@@ -0,0 +1,73 @@
+From 80810f04f2de6bae6e394f52ad9cdd2189862f74 Mon Sep 17 00:00:00 2001
+From: Jaroslav Rohel
+Date: Fri, 9 Nov 2018 07:35:13 +0100
+Subject: [PATCH] Fix setup of logging (log domains) (RhBug:1645897)
+
+New debug messages were added into GLib library. These messages come
+from the "GLib" log domain and were not hidden in the standard and
+quiet mode of the application.
+This fix hides log messages regardless on source log domain.
+
+Upstream-Status: Backport
+
+Signed-off-by: Zheng Ruoqin
+---
+ src/createrepo_shared.c | 19 ++-
+ src/misc.c | 5 -
+ 2 files changed, 10 insertions(+), 14 deletions(-)
+
+diff --git a/src/createrepo_shared.c b/src/createrepo_shared.c
+index 8a26787..7cb8ba8 100644
+--- a/src/createrepo_shared.c
b/src/createrepo_shared.c
+@@ -270,24 +270,17 @@ cr_lock_repo(const gchar *repo_dir,
+ void
+ cr_setup_logging(gboolean quiet, gboolean verbose)
+ {
+-g_log_set_default_handler (cr_log_fn, NULL);
+-
+ if (quiet) {
+ // Quiet mode
+-GLogLevelFlags levels = G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO |
+-G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_WARNING;
+-g_log_set_handler(NULL, levels, cr_null_log_fn, NULL);
+-g_log_set_handler("C_CREATEREPOLIB", levels, cr_null_log_fn, NULL);
++GLogLevelFlags hidden_levels = G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO
|
++ G_LOG_LEVEL_DEBUG |
G_LOG_LEVEL_WARNING;
++g_log_set_default_handler (cr_log_fn, GINT_TO_POINTER(hidden_levels));
+ } else if (verbose) {
+ // Verbose mode
+-GLogLevelFlags levels = G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO |
+-G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_WARNING;
+-g_log_set_handler(NULL, levels, cr_log_fn, NULL);
+-g_log_set_handler("C_CREATEREPOLIB", levels, cr_log_fn, NULL);
++g_log_set_default_handler (cr_log_fn, GINT_TO_POINTER(0));
+ } else {
+ // Standard mode
+-GLogLevelFlags levels = G_LOG_LEVEL_DEBUG;
+-g_log_set_handler(NULL, levels, cr_null_log_fn, NULL);
+-g_log_set_handler("C_CREATEREPOLIB", levels, cr_null_log_fn, NULL);
++GLogLevelFlags hidden_levels = G_LOG_LEVEL_DEBUG;
++g_log_set_default_handler (cr_log_fn, GINT_TO_POINTER(hidden_levels));
+ }
+ }
+diff --git a/src/misc.c b/src/misc.c
+index 9937480..9549a44 100644
+--- a/src/misc.c
b/src/misc.c
+@@ -912,8 +912,11 @@ void
+ cr_log_fn(const gchar *log_domain,
+ GLogLevelFlags log_level,
+ const gchar *message,
+- G_GNUC_UNUSED gpointer user_data)
++ gpointer user_data)
+ {
++gint hidden_log_levels = GPOINTER_TO_INT(user_data);
++if (log_level & hidden_log_levels)
++return;
+ switch(log_level) {
+ case G_LOG_LEVEL_ERROR:
+ if (log_domain) g_printerr("%s: ", log_domain);
+--
+1.8.3.1
+
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
b/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
index 2960811..08766b3 100644
--- a/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
+++ b/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRC_URI = "git://github.com/rpm-software-management/createrepo_c \
file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
file://0001-Correctly-install-the-shared-library.patch \
+ file://0001-Fix-setup-of-logging-log-domains-RhBug-1645897.patch \
"
PV = "0.11.1+git${SRCPV}"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] createrepo-c: Fix setup of logging (log domains)
New debug messages were added into GLib library. These messages come
from the "GLib" log domain and were not hidden in the standard and
quiet mode of the application.
This fix hides log messages regardless on source log domain.
Backport from 80810f04f2de6bae6e394f52ad9cdd2189862f74.
Signed-off-by: Zheng Ruoqin
---
...etup-of-logging-log-domains-RhBug-1645897.patch | 72 ++
.../createrepo-c/createrepo-c_git.bb | 1 +
2 files changed, 73 insertions(+)
create mode 100644
meta/recipes-devtools/createrepo-c/createrepo-c/0001-Fix-setup-of-logging-log-domains-RhBug-1645897.patch
diff --git
a/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Fix-setup-of-logging-log-domains-RhBug-1645897.patch
b/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Fix-setup-of-logging-log-domains-RhBug-1645897.patch
new file mode 100644
index 000..38bcdf8
--- /dev/null
+++
b/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Fix-setup-of-logging-log-domains-RhBug-1645897.patch
@@ -0,0 +1,72 @@
+From 80810f04f2de6bae6e394f52ad9cdd2189862f74 Mon Sep 17 00:00:00 2001
+From: Jaroslav Rohel
+Date: Fri, 9 Nov 2018 07:35:13 +0100
+Subject: [PATCH] Fix setup of logging (log domains) (RhBug:1645897)
+
+New debug messages were added into GLib library. These messages come
+from the "GLib" log domain and were not hidden in the standard and
+quiet mode of the application.
+This fix hides log messages regardless on source log domain.
+
+Upstream Status: Backport
+
+---
+ src/createrepo_shared.c | 19 ++-
+ src/misc.c | 5 -
+ 2 files changed, 10 insertions(+), 14 deletions(-)
+
+diff --git a/src/createrepo_shared.c b/src/createrepo_shared.c
+index 8a26787..7cb8ba8 100644
+--- a/src/createrepo_shared.c
b/src/createrepo_shared.c
+@@ -270,24 +270,17 @@ cr_lock_repo(const gchar *repo_dir,
+ void
+ cr_setup_logging(gboolean quiet, gboolean verbose)
+ {
+-g_log_set_default_handler (cr_log_fn, NULL);
+-
+ if (quiet) {
+ // Quiet mode
+-GLogLevelFlags levels = G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO |
+-G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_WARNING;
+-g_log_set_handler(NULL, levels, cr_null_log_fn, NULL);
+-g_log_set_handler("C_CREATEREPOLIB", levels, cr_null_log_fn, NULL);
++GLogLevelFlags hidden_levels = G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO
|
++ G_LOG_LEVEL_DEBUG |
G_LOG_LEVEL_WARNING;
++g_log_set_default_handler (cr_log_fn, GINT_TO_POINTER(hidden_levels));
+ } else if (verbose) {
+ // Verbose mode
+-GLogLevelFlags levels = G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO |
+-G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_WARNING;
+-g_log_set_handler(NULL, levels, cr_log_fn, NULL);
+-g_log_set_handler("C_CREATEREPOLIB", levels, cr_log_fn, NULL);
++g_log_set_default_handler (cr_log_fn, GINT_TO_POINTER(0));
+ } else {
+ // Standard mode
+-GLogLevelFlags levels = G_LOG_LEVEL_DEBUG;
+-g_log_set_handler(NULL, levels, cr_null_log_fn, NULL);
+-g_log_set_handler("C_CREATEREPOLIB", levels, cr_null_log_fn, NULL);
++GLogLevelFlags hidden_levels = G_LOG_LEVEL_DEBUG;
++g_log_set_default_handler (cr_log_fn, GINT_TO_POINTER(hidden_levels));
+ }
+ }
+diff --git a/src/misc.c b/src/misc.c
+index 9937480..9549a44 100644
+--- a/src/misc.c
b/src/misc.c
+@@ -912,8 +912,11 @@ void
+ cr_log_fn(const gchar *log_domain,
+ GLogLevelFlags log_level,
+ const gchar *message,
+- G_GNUC_UNUSED gpointer user_data)
++ gpointer user_data)
+ {
++gint hidden_log_levels = GPOINTER_TO_INT(user_data);
++if (log_level & hidden_log_levels)
++return;
+ switch(log_level) {
+ case G_LOG_LEVEL_ERROR:
+ if (log_domain) g_printerr("%s: ", log_domain);
+--
+1.8.3.1
+
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
b/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
index 2960811..08766b3 100644
--- a/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
+++ b/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRC_URI = "git://github.com/rpm-software-management/createrepo_c \
file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
file://0001-Correctly-install-the-shared-library.patch \
+ file://0001-Fix-setup-of-logging-log-domains-RhBug-1645897.patch \
"
PV = "0.11.1+git${SRCPV}"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [thud][PATCH] createrepo-c: Fix setup of logging (log domains)
New debug messages were added into GLib library. These messages come
from the "GLib" log domain and were not hidden in the standard and
quiet mode of the application.
This fix hides log messages regardless on source log domain.
Backport from 80810f04f2de6bae6e394f52ad9cdd2189862f74.
Signed-off-by: Zheng Ruoqin
---
...etup-of-logging-log-domains-RhBug-1645897.patch | 72 ++
.../createrepo-c/createrepo-c_git.bb | 1 +
2 files changed, 73 insertions(+)
create mode 100644
meta/recipes-devtools/createrepo-c/createrepo-c/0001-Fix-setup-of-logging-log-domains-RhBug-1645897.patch
diff --git
a/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Fix-setup-of-logging-log-domains-RhBug-1645897.patch
b/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Fix-setup-of-logging-log-domains-RhBug-1645897.patch
new file mode 100644
index 000..38bcdf8
--- /dev/null
+++
b/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Fix-setup-of-logging-log-domains-RhBug-1645897.patch
@@ -0,0 +1,72 @@
+From 80810f04f2de6bae6e394f52ad9cdd2189862f74 Mon Sep 17 00:00:00 2001
+From: Jaroslav Rohel
+Date: Fri, 9 Nov 2018 07:35:13 +0100
+Subject: [PATCH] Fix setup of logging (log domains) (RhBug:1645897)
+
+New debug messages were added into GLib library. These messages come
+from the "GLib" log domain and were not hidden in the standard and
+quiet mode of the application.
+This fix hides log messages regardless on source log domain.
+
+Upstream Status: Backport
+
+---
+ src/createrepo_shared.c | 19 ++-
+ src/misc.c | 5 -
+ 2 files changed, 10 insertions(+), 14 deletions(-)
+
+diff --git a/src/createrepo_shared.c b/src/createrepo_shared.c
+index 8a26787..7cb8ba8 100644
+--- a/src/createrepo_shared.c
b/src/createrepo_shared.c
+@@ -270,24 +270,17 @@ cr_lock_repo(const gchar *repo_dir,
+ void
+ cr_setup_logging(gboolean quiet, gboolean verbose)
+ {
+-g_log_set_default_handler (cr_log_fn, NULL);
+-
+ if (quiet) {
+ // Quiet mode
+-GLogLevelFlags levels = G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO |
+-G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_WARNING;
+-g_log_set_handler(NULL, levels, cr_null_log_fn, NULL);
+-g_log_set_handler("C_CREATEREPOLIB", levels, cr_null_log_fn, NULL);
++GLogLevelFlags hidden_levels = G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO
|
++ G_LOG_LEVEL_DEBUG |
G_LOG_LEVEL_WARNING;
++g_log_set_default_handler (cr_log_fn, GINT_TO_POINTER(hidden_levels));
+ } else if (verbose) {
+ // Verbose mode
+-GLogLevelFlags levels = G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO |
+-G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_WARNING;
+-g_log_set_handler(NULL, levels, cr_log_fn, NULL);
+-g_log_set_handler("C_CREATEREPOLIB", levels, cr_log_fn, NULL);
++g_log_set_default_handler (cr_log_fn, GINT_TO_POINTER(0));
+ } else {
+ // Standard mode
+-GLogLevelFlags levels = G_LOG_LEVEL_DEBUG;
+-g_log_set_handler(NULL, levels, cr_null_log_fn, NULL);
+-g_log_set_handler("C_CREATEREPOLIB", levels, cr_null_log_fn, NULL);
++GLogLevelFlags hidden_levels = G_LOG_LEVEL_DEBUG;
++g_log_set_default_handler (cr_log_fn, GINT_TO_POINTER(hidden_levels));
+ }
+ }
+diff --git a/src/misc.c b/src/misc.c
+index 9937480..9549a44 100644
+--- a/src/misc.c
b/src/misc.c
+@@ -912,8 +912,11 @@ void
+ cr_log_fn(const gchar *log_domain,
+ GLogLevelFlags log_level,
+ const gchar *message,
+- G_GNUC_UNUSED gpointer user_data)
++ gpointer user_data)
+ {
++gint hidden_log_levels = GPOINTER_TO_INT(user_data);
++if (log_level & hidden_log_levels)
++return;
+ switch(log_level) {
+ case G_LOG_LEVEL_ERROR:
+ if (log_domain) g_printerr("%s: ", log_domain);
+--
+1.8.3.1
+
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
b/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
index 2960811..08766b3 100644
--- a/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
+++ b/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRC_URI = "git://github.com/rpm-software-management/createrepo_c \
file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
file://0001-Correctly-install-the-shared-library.patch \
+ file://0001-Fix-setup-of-logging-log-domains-RhBug-1645897.patch \
"
PV = "0.11.1+git${SRCPV}"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] nss: Fix SHA_HTONL bug for arm 32be.
Rpm use nss as digest crypto library and which will cause an error as follows:
error: test-manual-1.2.3-20181012.noarch.rpm: Header SHA1 digest: BAD (Expected
f1deb7dc4a10742d88ccd1e967dbc62ae45095a5
!=4ad9d7dad6d70d6086eefec62612ad5d77f2fe81) => this value is wrong
error: test-manual-1.2.3-20181012.noarch.rpm: not an rpm package (or package
manifest)
The error is caused by SHA_HTONL in nss, for there is no need to reverse the
host value for arm 32be, so fix it.
Signed-off-by: Zheng Ruoqin
---
.../nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch | 34 ++
meta/recipes-support/nss/nss_3.40.bb | 1 +
2 files changed, 35 insertions(+)
create mode 100644
meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch
diff --git
a/meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch
b/meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch
new file mode 100644
index 000..7ba8d16
--- /dev/null
+++ b/meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch
@@ -0,0 +1,34 @@
+Subject: [PATCH] Fix SHA_HTONL bug for arm 32be.
+
+In arm 32be, there is no need to reverse the host value.
+
+Upstream Status: Pending
+
+Signed-off-by: Zheng Ruoqin
+---
+ lib/freebl/sha_fast.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/nss/lib/freebl/sha_fast.h b/nss/lib/freebl/sha_fast.h
+index 4f37d13..8072eda 100644
+--- a/nss/lib/freebl/sha_fast.h
b/nss/lib/freebl/sha_fast.h
+@@ -99,6 +99,7 @@ swap4b(PRUint32 value)
+ defined(__ARM_ARCH_7__) || \
+ defined(__ARM_ARCH_7A__) || \
+ defined(__ARM_ARCH_7R__)))
++#if defined(IS_LITTLE_ENDIAN)
+ static __inline__ PRUint32
+ swap4b(PRUint32 value)
+ {
+@@ -109,6 +110,7 @@ swap4b(PRUint32 value)
+ return ret;
+ }
+ #define SHA_HTONL(x) swap4b(x)
++#endif
+
+ #endif /* x86 family */
+
+--
+2.7.4
+
diff --git a/meta/recipes-support/nss/nss_3.40.bb
b/meta/recipes-support/nss/nss_3.40.bb
index 23c95dd..afc5081 100644
--- a/meta/recipes-support/nss/nss_3.40.bb
+++ b/meta/recipes-support/nss/nss_3.40.bb
@@ -28,6 +28,7 @@ SRC_URI =
"http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO
file://blank-cert9.db \
file://blank-key4.db \
file://system-pkcs11.txt \
+ file://nss-fix-SHA_HTONL-bug-for-arm-32be.patch \
"
SRC_URI[md5sum] = "f7aec858d192ae03d0e9a35a730c70fa"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [question] rpm: nss problem on arm32be
Hi All: When I use rpm on arm32be, I found a Header SHA1 digest problem as follows: # rpm -qpi test-manual-1.2.3-20181012.noarch.rpm error: test-manual-1.2.3-20181012.noarch.rpm: Header SHA1 digest: BAD (Expected f1deb7dc4a10742d88ccd1e967dbc62ae45095a5 !=4ad9d7dad6d70d6086eefec62612ad5d77f2fe81) => this value is wrong error: test-manual-1.2.3-20181012.noarch.rpm: not an rpm package (or package manifest) I found it is caused by the hash of nss, if I rebuild rpm with beecropt, this problem will be fix. diff --git a/meta-ubinux/recipes-contrib/rpm/rpm_4.14.1.bb b/meta-ubinux/recipes-contrib/rpm/rpm_4.14.1.bb EXTRA_OECONF_append = " --without-lua --enable-python" +EXTRA_OECONF_append_armeb = " --with-crypto=beecrypt" EXTRA_OECONF_append_libc-musl = " --disable-nls" but I don't know why rpm with nss can't work well on arm32be, does anyone know the reason about it? ------ Zheng Ruoqin Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) ADDR.: No.6 Wenzhu Road, Software Avenue, Nanjing, 210012, China MAIL : zhengrq.f...@cn.fujistu.com -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] mdadm: add init and systemd service scripts
Add init script and service file for sysvinit and systemd.
Signed-off-by: Zheng Ruoqin
---
.../recipes-extended/mdadm/files/mdadm.conf.sample | 1 +
meta/recipes-extended/mdadm/files/mdadm.default| 25
meta/recipes-extended/mdadm/files/mdadm.init | 71 ++
.../recipes-extended/mdadm/files/mdmonitor.service | 15 +
meta/recipes-extended/mdadm/mdadm_4.0.bb | 28 -
5 files changed, 139 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-extended/mdadm/files/mdadm.conf.sample
create mode 100644 meta/recipes-extended/mdadm/files/mdadm.default
create mode 100644 meta/recipes-extended/mdadm/files/mdadm.init
create mode 100644 meta/recipes-extended/mdadm/files/mdmonitor.service
diff --git a/meta/recipes-extended/mdadm/files/mdadm.conf.sample
b/meta/recipes-extended/mdadm/files/mdadm.conf.sample
new file mode 100644
index 000..b869d8f
--- /dev/null
+++ b/meta/recipes-extended/mdadm/files/mdadm.conf.sample
@@ -0,0 +1 @@
+MAILADDR r...@mydomain.com
diff --git a/meta/recipes-extended/mdadm/files/mdadm.default
b/meta/recipes-extended/mdadm/files/mdadm.default
new file mode 100644
index 000..2e74fdb
--- /dev/null
+++ b/meta/recipes-extended/mdadm/files/mdadm.default
@@ -0,0 +1,25 @@
+# mdadm configuration
+#
+# You can run 'dpkg-reconfigure mdadm' to modify the values in this file, if
+# you want. You can also change the values here and changes will be preserved.
+# Do note that only the values are preserved; the rest of the file is
+# rewritten.
+#
+
+# AUTOCHECK:
+# should mdadm run periodic redundancy checks over your arrays? See
+# /etc/cron.d/mdadm.
+AUTOCHECK=true
+
+# START_DAEMON:
+# should mdadm start the MD monitoring daemon during boot?
+START_DAEMON=true
+
+# DAEMON_OPTIONS:
+# additional options to pass to the daemon.
+DAEMON_OPTIONS="--syslog"
+
+# VERBOSE:
+# if this variable is set to true, mdadm will be a little more verbose e.g.
+# when creating the initramfs.
+VERBOSE=false
diff --git a/meta/recipes-extended/mdadm/files/mdadm.init
b/meta/recipes-extended/mdadm/files/mdadm.init
new file mode 100644
index 000..8a9fbe3
--- /dev/null
+++ b/meta/recipes-extended/mdadm/files/mdadm.init
@@ -0,0 +1,71 @@
+#!/bin/sh
+#
+# Start the MD monitor daemon for all active MD arrays if desired.
+#
+### BEGIN INIT INFO
+# Provides: mdadm
+# Required-Start:$local_fs $syslog mdadm-raid
+# Required-Stop: $local_fs $syslog mdadm-raid
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: MD monitoring daemon
+# Description: mdadm provides a monitor mode, in which it will scan for
+#problems with the MD devices. If a problem is found, the
+#administrator is alerted via email, or a custom script is
+#run.
+### END INIT INFO
+#
+
+MDADM=/sbin/mdadm
+RUNDIR=/var/run/mdadm
+PIDFILE=$RUNDIR/monitor.pid
+DEBIANCONFIG=/etc/default/mdadm
+
+test -x "$MDADM" || exit 0
+
+test -f /proc/mdstat || exit 0
+
+START_DAEMON=true
+test -f $DEBIANCONFIG && . $DEBIANCONFIG
+
+. /lib/lsb/init-functions
+
+# Include functions
+. /etc/init.d/functions
+
+case "${1:-}" in
+ start)
+if is_true $START_DAEMON; then
+ log_daemon_msg "Starting MD monitoring service" "mdadm --monitor"
+ mkdir -p $RUNDIR
+ start-stop-daemon -S -p $PIDFILE -x $MDADM -- \
+--monitor --pid-file $PIDFILE --daemonise --scan ${DAEMON_OPTIONS:-}
+ RETVAL=$?
+ log_end_msg $RETVAL
+ exit $RETVAL
+fi
+;;
+ stop)
+if [ -f $PIDFILE ] ; then
+ log_daemon_msg "Stopping MD monitoring service" "mdadm --monitor"
+ start-stop-daemon -K -p $PIDFILE -x $MDADM
+ RETVAL=$?
+ rm -f $PIDFILE
+ log_end_msg $RETVAL
+ exit $RETVAL
+fi
+;;
+ status)
+status -p $PIDFILE "$MDADM" && exit 0 || exit $?
+;;
+ restart|reload|force-reload)
+${0:-} stop
+${0:-} start
+;;
+ *)
+echo "Usage: ${0:-} {start|stop|status|restart|reload|force-reload}" >&2
+exit 1
+;;
+esac
+
+exit 0
diff --git a/meta/recipes-extended/mdadm/files/mdmonitor.service
b/meta/recipes-extended/mdadm/files/mdmonitor.service
new file mode 100644
index 000..cd6c865
--- /dev/null
+++ b/meta/recipes-extended/mdadm/files/mdmonitor.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Software RAID monitoring and management
+After=syslog.target
+ConditionPathExists=/etc/mdadm.conf
+
+[Service]
+Type=forking
+RuntimeDirectory=/run/mdadm
+PIDFile=/run/mdadm/mdadm.pid
+EnvironmentFile=-/etc/sysconfig/mdmonitor
+ExecStart=/sbin/mdadm --monitor --scan -f --pid-file=/run/mdadm/mdadm.pid
+ExecStopPost=/bin/rm -rf /run/mdadm/mdadm.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-extended/mdadm/mdadm_4.0.bb
b/meta/recipes-extended/mdadm/mdadm_4.0.bb
index 226b974..bd3f710 1006
Re: [OE-core] [PATCH 8/8] [PATCH v2] meta-toolchain: Added dnf-nativesdk into cross-development toolchain.
Hi Richard eSDK is actually a better technique for developers. But it’s only suitable for those people who has experience on Yocto Project. In the other hand, using dnf-nativesdk in meta-toolchain to customize rootfs is easier fot those people who are familiar with dnf(I think most linux user known it). For example, developers finish the OSS build work and provide the toolchain and packages to users. In this case, users do not need to know any knowledge about yocto build system but just how to use dnf to install a rootfs. So it can reduce the workload of end-users who need to customize rootfs for their embedded device. At lease, they don’t need to maintain a yocto build server. -- Zheng Ruoqin Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) ADDR.: No.6 Wenzhu Road, Software Avenue, Nanjing, 210012, China MAIL : zhengrq.f...@cn.fujistu.com -Original Message- From: Richard Purdie [mailto:richard.pur...@linuxfoundation.org] Sent: Monday, June 25, 2018 3:19 PM To: Zheng, Ruoqin/郑 若钦 ; openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH 8/8] [PATCH v2] meta-toolchain: Added dnf-nativesdk into cross-development toolchain. On Sun, 2018-06-24 at 03:53 +0800, Zheng Ruoqin wrote: > Add dnf-nativesdk and it's runtime dependence to make dnf work on > cross-development environment. > > Signed-off-by: Zheng Ruoqin I don't mind adding enough of the changes so that dnf-nativesdk is buildable so some of your other patches can be merged. I do not want to add dnf-nativesdk to meta-toolchain by default however as there are many people who don't need this there. I'd suggest this is a customisation you'll need to maintain yourselves. I appreciate why you want to do this, I also believe we have a better technique in the form of the eSDK, where we can use the same tools and the same codebase to build for example a rootfs. The eSDK use case (a locked sstate cache) is designed so that a user doesn't need to worry about a whole build, or building from scratch. They can use the same tools everyone else uses and the same workflow and code to bulld a rootfs or a recipe or any workflow. This makes it much more powerful and able to fulfil many different use cases compared to meta-toolchain. In the long run I'd therefore prefer we promote this and use the eSDK as I think it will become our preferred way of handling problems like this. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] mdadm： systemd service question
Hi All： I found there is a systemd service file in the source code of mdadm-4.0. mdadm-4.0/systemd/mdmonitor.service And why this service was not added into the rpm package? rpm -qpl deploy-rpms/x86_64/mdadm-4.0-r0.x86_64.rpm /lib /lib/udev /lib/udev/rules.d /lib/udev/rules.d/63-md-raid-arrays.rules /lib/udev/rules.d/64-md-raid-assembly.rules /sbin /sbin/mdadm /sbin/mdmon -- Zheng Ruoqin Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) ADDR.: No.6 Wenzhu Road, Software Avenue, Nanjing, 210012, China MAIL : zhengrq.f...@cn.fujistu.com -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3] sshd: add sshd.service
Hi Ross:
I want to add this for in Ubuntu and Fedora, sshd.socket and
sshd.service can both coexist.
So, maybe we provide both of them, and user can choose the way they
want.
--
Zheng Ruoqin
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
ADDR.: No.6 Wenzhu Road, Software Avenue,
Nanjing, 210012, China
MAIL : zhengrq.f...@cn.fujistu.com
-Original Message-
From: Burton, Ross [mailto:ross.bur...@intel.com]
Sent: Monday, July 23, 2018 6:18 PM
To: Zheng, Ruoqin/郑 若钦
Cc: OE-core
Subject: Re: [OE-core] [PATCH v3] sshd: add sshd.service
Still no explanation why you'd want to do this and not use socket activation.
Ross
On 23 July 2018 at 10:02, Zheng Ruoqin wrote:
> Add sshd.service for user to start the sshd daemon.
>
> Signed-off-by: Zheng Ruoqin
> ---
> meta/recipes-connectivity/openssh/openssh/sshd.service | 16
> meta/recipes-connectivity/openssh/openssh_7.7p1.bb | 6 ++
> 2 files changed, 22 insertions(+)
> create mode 100644
> meta/recipes-connectivity/openssh/openssh/sshd.service
>
> diff --git a/meta/recipes-connectivity/openssh/openssh/sshd.service
> b/meta/recipes-connectivity/openssh/openssh/sshd.service
> new file mode 100644
> index 000..2d2717d
> --- /dev/null
> +++ b/meta/recipes-connectivity/openssh/openssh/sshd.service
> @@ -0,0 +1,16 @@
> +[Unit]
> +Description=OpenSSH server daemon
> +Wants=sshdgenkeys.service
> +After=sshdgenkeys.service
> +
> +[Service]
> +Environment="SSHD_OPTS="
> +EnvironmentFile=-/etc/default/ssh
> +ExecStart=-@SBINDIR@/sshd -i $SSHD_OPTS ExecReload=@BASE_BINDIR@/kill
> +-HUP $MAINPID KillMode=process Restart=on-failure RestartSec=42s
> +
> +[Install]
> +WantedBy=multi-user.target
> diff --git a/meta/recipes-connectivity/openssh/openssh_7.7p1.bb
> b/meta/recipes-connectivity/openssh/openssh_7.7p1.bb
> index b3da5f6..b4f4c6d 100644
> --- a/meta/recipes-connectivity/openssh/openssh_7.7p1.bb
> +++ b/meta/recipes-connectivity/openssh/openssh_7.7p1.bb
> @@ -17,6 +17,7 @@ SRC_URI =
> "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
> file://ssh_config \
> file://init \
> ${@bb.utils.contains('DISTRO_FEATURES', 'pam',
> '${PAM_SRC_URI}', '', d)} \
> + ${@bb.utils.contains('SSHD_DAEMON', 'service',
> + '${SSHD_DAEMON_SRC_URI}', '', d)} \
> file://sshd.socket \
> file://sshd@.service \
> file://sshdgenkeys.service \ @@ -30,6 +31,8 @@ SRC_URI =
> "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
>
> PAM_SRC_URI = "file://sshd"
>
> +SSHD_DAEMON_SRC_URI = "file://sshd.service"
> +
> SRC_URI[md5sum] = "68ba883aff6958297432e5877e9a0fe2"
> SRC_URI[sha256sum] =
> "d73be7e684e99efcd024be15a30bffcbe41b012b2f7b3c9084aed621775e6b8f"
>
> @@ -111,6 +114,9 @@ do_install_append () {
> echo "HostKey /var/run/ssh/ssh_host_ed25519_key" >>
> ${D}${sysconfdir}/ssh/sshd_config_readonly
>
> install -d ${D}${systemd_unitdir}/system
> + if [ "${@bb.utils.filter('SSHD_DAEMON', 'service', d)}" ]; then
> + install -c -m 0644 ${WORKDIR}/sshd.service
> ${D}${systemd_unitdir}/system
> +fi
> install -c -m 0644 ${WORKDIR}/sshd.socket
> ${D}${systemd_unitdir}/system
> install -c -m 0644 ${WORKDIR}/sshd@.service
> ${D}${systemd_unitdir}/system
> install -c -m 0644 ${WORKDIR}/sshdgenkeys.service
> ${D}${systemd_unitdir}/system
> --
> 2.7.4
>
>
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3] sshd: add sshd.service
Add sshd.service for user to start the sshd daemon.
Signed-off-by: Zheng Ruoqin
---
meta/recipes-connectivity/openssh/openssh/sshd.service | 16
meta/recipes-connectivity/openssh/openssh_7.7p1.bb | 6 ++
2 files changed, 22 insertions(+)
create mode 100644 meta/recipes-connectivity/openssh/openssh/sshd.service
diff --git a/meta/recipes-connectivity/openssh/openssh/sshd.service
b/meta/recipes-connectivity/openssh/openssh/sshd.service
new file mode 100644
index 000..2d2717d
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh/sshd.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=OpenSSH server daemon
+Wants=sshdgenkeys.service
+After=sshdgenkeys.service
+
+[Service]
+Environment="SSHD_OPTS="
+EnvironmentFile=-/etc/default/ssh
+ExecStart=-@SBINDIR@/sshd -i $SSHD_OPTS
+ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID
+KillMode=process
+Restart=on-failure
+RestartSec=42s
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/openssh/openssh_7.7p1.bb
b/meta/recipes-connectivity/openssh/openssh_7.7p1.bb
index b3da5f6..b4f4c6d 100644
--- a/meta/recipes-connectivity/openssh/openssh_7.7p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_7.7p1.bb
@@ -17,6 +17,7 @@ SRC_URI =
"http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
file://ssh_config \
file://init \
${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}',
'', d)} \
+ ${@bb.utils.contains('SSHD_DAEMON', 'service',
'${SSHD_DAEMON_SRC_URI}', '', d)} \
file://sshd.socket \
file://sshd@.service \
file://sshdgenkeys.service \
@@ -30,6 +31,8 @@ SRC_URI =
"http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
PAM_SRC_URI = "file://sshd"
+SSHD_DAEMON_SRC_URI = "file://sshd.service"
+
SRC_URI[md5sum] = "68ba883aff6958297432e5877e9a0fe2"
SRC_URI[sha256sum] =
"d73be7e684e99efcd024be15a30bffcbe41b012b2f7b3c9084aed621775e6b8f"
@@ -111,6 +114,9 @@ do_install_append () {
echo "HostKey /var/run/ssh/ssh_host_ed25519_key" >>
${D}${sysconfdir}/ssh/sshd_config_readonly
install -d ${D}${systemd_unitdir}/system
+ if [ "${@bb.utils.filter('SSHD_DAEMON', 'service', d)}" ]; then
+ install -c -m 0644 ${WORKDIR}/sshd.service
${D}${systemd_unitdir}/system
+fi
install -c -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_unitdir}/system
install -c -m 0644 ${WORKDIR}/sshd@.service
${D}${systemd_unitdir}/system
install -c -m 0644 ${WORKDIR}/sshdgenkeys.service
${D}${systemd_unitdir}/system
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] sshd: add sshd.service
Add sshd.service for user to start the sshd daemon.
Signed-off-by: Zheng Ruoqin
---
meta/recipes-connectivity/openssh/openssh/sshd.service | 16
meta/recipes-connectivity/openssh/openssh_7.7p1.bb | 6 ++
2 files changed, 22 insertions(+)
create mode 100644 meta/recipes-connectivity/openssh/openssh/sshd.service
diff --git a/meta/recipes-connectivity/openssh/openssh/sshd.service
b/meta/recipes-connectivity/openssh/openssh/sshd.service
new file mode 100644
index 000..eb87d32
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh/sshd.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=OpenSSH server daemon
+Documentation=man:sshd(8) man:sshd_config(5)
+After=network.target sshd-keygen.service
+Wants=sshd-keygen.service
+
+[Service]
+EnvironmentFile=/etc/sysconfig/sshd
+ExecStart=/usr/sbin/sshd -D $OPTIONS
+ExecReload=/bin/kill -HUP $MAINPID
+KillMode=process
+Restart=on-failure
+RestartSec=42s
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/openssh/openssh_7.7p1.bb
b/meta/recipes-connectivity/openssh/openssh_7.7p1.bb
index b3da5f6..b4f4c6d 100644
--- a/meta/recipes-connectivity/openssh/openssh_7.7p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_7.7p1.bb
@@ -17,6 +17,7 @@ SRC_URI =
"http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
file://ssh_config \
file://init \
${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}',
'', d)} \
+ ${@bb.utils.contains('SSHD_DAEMON', 'service',
'${SSHD_DAEMON_SRC_URI}', '', d)} \
file://sshd.socket \
file://sshd@.service \
file://sshdgenkeys.service \
@@ -30,6 +31,8 @@ SRC_URI =
"http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
PAM_SRC_URI = "file://sshd"
+SSHD_DAEMON_SRC_URI = "file://sshd.service"
+
SRC_URI[md5sum] = "68ba883aff6958297432e5877e9a0fe2"
SRC_URI[sha256sum] =
"d73be7e684e99efcd024be15a30bffcbe41b012b2f7b3c9084aed621775e6b8f"
@@ -111,6 +114,9 @@ do_install_append () {
echo "HostKey /var/run/ssh/ssh_host_ed25519_key" >>
${D}${sysconfdir}/ssh/sshd_config_readonly
install -d ${D}${systemd_unitdir}/system
+ if [ "${@bb.utils.filter('SSHD_DAEMON', 'service', d)}" ]; then
+ install -c -m 0644 ${WORKDIR}/sshd.service
${D}${systemd_unitdir}/system
+fi
install -c -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_unitdir}/system
install -c -m 0644 ${WORKDIR}/sshd@.service
${D}${systemd_unitdir}/system
install -c -m 0644 ${WORKDIR}/sshdgenkeys.service
${D}${systemd_unitdir}/system
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [sumo][PATCH] glibc: fix CVE-2018-11237
Ping
--
Zheng Ruoqin
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
ADDR.: No.6 Wenzhu Road, Software Avenue,
Nanjing, 210012, China
MAIL : zhengrq.f...@cn.fujistu.com
-Original Message-
From: Zheng, Ruoqin/郑 若钦
Sent: Tuesday, June 26, 2018 2:05 PM
To: openembedded-core@lists.openembedded.org
Cc: Zheng, Ruoqin/郑 若钦
Subject: [OE-core][sumo][PATCH] glibc: fix CVE-2018-11237
glibc: fix CVE-2018-11237
Signed-off-by: Zheng Ruoqin
---
meta/recipes-core/glibc/glibc/CVE-2018-11237.patch | 83 ++
meta/recipes-core/glibc/glibc_2.27.bb | 1 +
2 files changed, 84 insertions(+)
create mode 100644 meta/recipes-core/glibc/glibc/CVE-2018-11237.patch
diff --git a/meta/recipes-core/glibc/glibc/CVE-2018-11237.patch
b/meta/recipes-core/glibc/glibc/CVE-2018-11237.patch
new file mode 100644
index 000..33168be
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc/CVE-2018-11237.patch
@@ -0,0 +1,83 @@
+From 9b7c6e4176e61c59b0a63c6ba906d875dc0e Mon Sep 17 00:00:00 2001
+From: Andreas Schwab
+Date: Tue, 22 May 2018 10:37:59 +0200
+Subject: [PATCH] Don't write beyond destination in
+__mempcpy_avx512_no_vzeroupper (bug 23196)
+
+When compiled as mempcpy, the return value is the end of the estination
+buffer, thus it cannot be used to refer to the start of it.
+
+2018-05-23 Andreas Schwab
+
+ [BZ #23196]
+ CVE-2018-11237
+ * sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S
+ (L(preloop_large)): Save initial destination pointer in %r11 and
+ use it instead of %rax after the loop.
+ * string/test-mempcpy.c (MIN_PAGE_SIZE): Define.
+
+CVE: CVE-2018-11237
+Upstream-Status: Backport
+Signed-off-by: Zheng Ruoqin
+---
+ ChangeLog | 9 +
+ string/test-mempcpy.c | 1 +
+ sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S | 5 +++--
+ 3 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 23ff0ea..85f6d25 100644
+--- a/ChangeLog
b/ChangeLog
+@@ -1,3 +1,12 @@
++2018-05-23 Andreas Schwab
++
++ [BZ #23196]
++ CVE-2018-11237
++ * sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S
++ (L(preloop_large)): Save initial destination pointer in %r11 and
++ use it instead of %rax after the loop.
++ * string/test-mempcpy.c (MIN_PAGE_SIZE): Define.
++
+ 2018-02-22 Andrew Waterman
+
+ [BZ # 22884]
+diff --git a/string/test-mempcpy.c b/string/test-mempcpy.c index
+c08fba8..d98ecdd 100644
+--- a/string/test-mempcpy.c
b/string/test-mempcpy.c
+@@ -18,6 +18,7 @@
+<http://www.gnu.org/licenses/>. */
+
+ #define MEMCPY_RESULT(dst, len) (dst) + (len)
++#define MIN_PAGE_SIZE 131072
+ #define TEST_MAIN
+ #define TEST_NAME "mempcpy"
+ #include "test-string.h"
+diff --git a/sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S
+b/sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S
+index 23c0f7a..a55cf6f 100644
+--- a/sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S
b/sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S
+@@ -335,6 +335,7 @@ L(preloop_large):
+ ja L(preloop_large_bkw)
+ vmovups (%rsi), %zmm4
+ vmovups 0x40(%rsi), %zmm5
++ mov %rdi, %r11
+
+ /* Align destination for access with non-temporal stores in the loop. */
+ mov %rdi, %r8
+@@ -366,8 +367,8 @@ L(gobble_256bytes_nt_loop):
+ cmp $256, %rdx
+ ja L(gobble_256bytes_nt_loop)
+ sfence
+- vmovups %zmm4, (%rax)
+- vmovups %zmm5, 0x40(%rax)
++ vmovups %zmm4, (%r11)
++ vmovups %zmm5, 0x40(%r11)
+ jmp L(check)
+
+ L(preloop_large_bkw):
+--
+1.8.3.1
+
diff --git a/meta/recipes-core/glibc/glibc_2.27.bb
b/meta/recipes-core/glibc/glibc_2.27.bb
index c814798..59c9d07 100644
--- a/meta/recipes-core/glibc/glibc_2.27.bb
+++ b/meta/recipes-core/glibc/glibc_2.27.bb
@@ -45,6 +45,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
file://0028-bits-siginfo-consts.h-enum-definition-for-TRAP_HWBKP.patch \
file://0029-Replace-strncpy-with-memccpy-to-fix-Wstringop-trunca.patch \
file://0030-plural_c_no_preprocessor_lines.patch \
+ file://CVE-2018-11237.patch \
"
NATIVESDKFIXES ?= ""
--
1.8.3.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] sshd: add sshd.service
Add sshd.service for user to start the sshd deamon.
Signed-off-by: Zheng Ruoqin
---
meta/recipes-connectivity/openssh/openssh/sshd.service | 16
meta/recipes-connectivity/openssh/openssh_7.7p1.bb | 2 ++
2 files changed, 18 insertions(+)
create mode 100644 meta/recipes-connectivity/openssh/openssh/sshd.service
diff --git a/meta/recipes-connectivity/openssh/openssh/sshd.service
b/meta/recipes-connectivity/openssh/openssh/sshd.service
new file mode 100644
index 000..eb87d32
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh/sshd.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=OpenSSH server daemon
+Documentation=man:sshd(8) man:sshd_config(5)
+After=network.target sshd-keygen.service
+Wants=sshd-keygen.service
+
+[Service]
+EnvironmentFile=/etc/sysconfig/sshd
+ExecStart=/usr/sbin/sshd -D $OPTIONS
+ExecReload=/bin/kill -HUP $MAINPID
+KillMode=process
+Restart=on-failure
+RestartSec=42s
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/openssh/openssh_7.7p1.bb
b/meta/recipes-connectivity/openssh/openssh_7.7p1.bb
index b3da5f6..def4062 100644
--- a/meta/recipes-connectivity/openssh/openssh_7.7p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_7.7p1.bb
@@ -17,6 +17,7 @@ SRC_URI =
"http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
file://ssh_config \
file://init \
${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}',
'', d)} \
+ file://sshd.service \
file://sshd.socket \
file://sshd@.service \
file://sshdgenkeys.service \
@@ -111,6 +112,7 @@ do_install_append () {
echo "HostKey /var/run/ssh/ssh_host_ed25519_key" >>
${D}${sysconfdir}/ssh/sshd_config_readonly
install -d ${D}${systemd_unitdir}/system
+ install -c -m 0644 ${WORKDIR}/sshd.service ${D}${systemd_unitdir}/system
install -c -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_unitdir}/system
install -c -m 0644 ${WORKDIR}/sshd@.service
${D}${systemd_unitdir}/system
install -c -m 0644 ${WORKDIR}/sshdgenkeys.service
${D}${systemd_unitdir}/system
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [sumo][PATCH] glibc: fix CVE-2018-11237
glibc: fix CVE-2018-11237
Signed-off-by: Zheng Ruoqin
---
meta/recipes-core/glibc/glibc/CVE-2018-11237.patch | 83 ++
meta/recipes-core/glibc/glibc_2.27.bb | 1 +
2 files changed, 84 insertions(+)
create mode 100644 meta/recipes-core/glibc/glibc/CVE-2018-11237.patch
diff --git a/meta/recipes-core/glibc/glibc/CVE-2018-11237.patch
b/meta/recipes-core/glibc/glibc/CVE-2018-11237.patch
new file mode 100644
index 000..33168be
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc/CVE-2018-11237.patch
@@ -0,0 +1,83 @@
+From 9b7c6e4176e61c59b0a63c6ba906d875dc0e Mon Sep 17 00:00:00 2001
+From: Andreas Schwab
+Date: Tue, 22 May 2018 10:37:59 +0200
+Subject: [PATCH] Don't write beyond destination in
+ __mempcpy_avx512_no_vzeroupper (bug 23196)
+
+When compiled as mempcpy, the return value is the end of the
+estination
+buffer, thus it cannot be used to refer to the start of it.
+
+2018-05-23 Andreas Schwab
+
+ [BZ #23196]
+ CVE-2018-11237
+ * sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S
+ (L(preloop_large)): Save initial destination pointer in %r11 and
+ use it instead of %rax after the loop.
+ * string/test-mempcpy.c (MIN_PAGE_SIZE): Define.
+
+CVE: CVE-2018-11237
+Upstream-Status: Backport
+Signed-off-by: Zheng Ruoqin
+---
+ ChangeLog | 9 +
+ string/test-mempcpy.c | 1 +
+ sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S | 5 +++--
+ 3 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 23ff0ea..85f6d25 100644
+--- a/ChangeLog
b/ChangeLog
+@@ -1,3 +1,12 @@
++2018-05-23 Andreas Schwab
++
++ [BZ #23196]
++ CVE-2018-11237
++ * sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S
++ (L(preloop_large)): Save initial destination pointer in %r11 and
++ use it instead of %rax after the loop.
++ * string/test-mempcpy.c (MIN_PAGE_SIZE): Define.
++
+ 2018-02-22 Andrew Waterman
+
+ [BZ # 22884]
+diff --git a/string/test-mempcpy.c b/string/test-mempcpy.c
+index c08fba8..d98ecdd 100644
+--- a/string/test-mempcpy.c
b/string/test-mempcpy.c
+@@ -18,6 +18,7 @@
+<http://www.gnu.org/licenses/>. */
+
+ #define MEMCPY_RESULT(dst, len) (dst) + (len)
++#define MIN_PAGE_SIZE 131072
+ #define TEST_MAIN
+ #define TEST_NAME "mempcpy"
+ #include "test-string.h"
+diff --git a/sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S
b/sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S
+index 23c0f7a..a55cf6f 100644
+--- a/sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S
b/sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S
+@@ -335,6 +335,7 @@ L(preloop_large):
+ ja L(preloop_large_bkw)
+ vmovups (%rsi), %zmm4
+ vmovups 0x40(%rsi), %zmm5
++ mov %rdi, %r11
+
+ /* Align destination for access with non-temporal stores in the loop. */
+ mov %rdi, %r8
+@@ -366,8 +367,8 @@ L(gobble_256bytes_nt_loop):
+ cmp $256, %rdx
+ ja L(gobble_256bytes_nt_loop)
+ sfence
+- vmovups %zmm4, (%rax)
+- vmovups %zmm5, 0x40(%rax)
++ vmovups %zmm4, (%r11)
++ vmovups %zmm5, 0x40(%r11)
+ jmp L(check)
+
+ L(preloop_large_bkw):
+--
+1.8.3.1
+
diff --git a/meta/recipes-core/glibc/glibc_2.27.bb
b/meta/recipes-core/glibc/glibc_2.27.bb
index c814798..59c9d07 100644
--- a/meta/recipes-core/glibc/glibc_2.27.bb
+++ b/meta/recipes-core/glibc/glibc_2.27.bb
@@ -45,6 +45,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
file://0028-bits-siginfo-consts.h-enum-definition-for-TRAP_HWBKP.patch \
file://0029-Replace-strncpy-with-memccpy-to-fix-Wstringop-trunca.patch \
file://0030-plural_c_no_preprocessor_lines.patch \
+ file://CVE-2018-11237.patch \
"
NATIVESDKFIXES ?= ""
--
1.8.3.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] glibc: fix CVE-2018-11237
glibc: fix CVE-2018-11237
Signed-off-by: Zheng Ruoqin
---
meta/recipes-core/glibc/glibc/CVE-2018-11237.patch | 82 ++
meta/recipes-core/glibc/glibc_2.27.bb | 1 +
2 files changed, 83 insertions(+)
create mode 100644 meta/recipes-core/glibc/glibc/CVE-2018-11237.patch
diff --git a/meta/recipes-core/glibc/glibc/CVE-2018-11237.patch
b/meta/recipes-core/glibc/glibc/CVE-2018-11237.patch
new file mode 100644
index 000..632aa56
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc/CVE-2018-11237.patch
@@ -0,0 +1,82 @@
+From 9b7c6e4176e61c59b0a63c6ba906d875dc0e Mon Sep 17 00:00:00 2001
+From: Andreas Schwab
+Date: Tue, 22 May 2018 10:37:59 +0200
+Subject: [PATCH] Don't write beyond destination in
+ __mempcpy_avx512_no_vzeroupper (bug 23196)
+
+When compiled as mempcpy, the return value is the end of the destination
+buffer, thus it cannot be used to refer to the start of it.
+
+2018-05-23 Andreas Schwab
+
+ [BZ #23196]
+ CVE-2018-11237
+ * sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S
+ (L(preloop_large)): Save initial destination pointer in %r11 and
+ use it instead of %rax after the loop.
+ * string/test-mempcpy.c (MIN_PAGE_SIZE): Define.
+
+CVE: CVE-2018-11237
+Upstream-Status: Backport
+Signed-off-by: Zheng Ruoqin
+---
+ ChangeLog | 9 +
+ string/test-mempcpy.c | 1 +
+ sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S | 5 +++--
+ 3 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index fa0a07c..bc09dec 100644
+--- a/ChangeLog
b/ChangeLog
+@@ -1,3 +1,12 @@
++2018-05-23 Andreas Schwab
++
++ [BZ #23196]
++ CVE-2018-11237
++ * sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S
++ (L(preloop_large)): Save initial destination pointer in %r11 and
++ use it instead of %rax after the loop.
++ * string/test-mempcpy.c (MIN_PAGE_SIZE): Define.
++
+ 2018-05-09 Paul Pluzhnikov
+
+ [BZ #22786]
+diff --git a/string/test-mempcpy.c b/string/test-mempcpy.c
+index c08fba8..d98ecdd 100644
+--- a/string/test-mempcpy.c
b/string/test-mempcpy.c
+@@ -18,6 +18,7 @@
+<http://www.gnu.org/licenses/>. */
+
+ #define MEMCPY_RESULT(dst, len) (dst) + (len)
++#define MIN_PAGE_SIZE 131072
+ #define TEST_MAIN
+ #define TEST_NAME "mempcpy"
+ #include "test-string.h"
+diff --git a/sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S
b/sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S
+index 23c0f7a..a55cf6f 100644
+--- a/sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S
b/sysdeps/x86_64/multiarch/memmove-avx512-no-vzeroupper.S
+@@ -335,6 +335,7 @@ L(preloop_large):
+ ja L(preloop_large_bkw)
+ vmovups (%rsi), %zmm4
+ vmovups 0x40(%rsi), %zmm5
++ mov %rdi, %r11
+
+ /* Align destination for access with non-temporal stores in the loop. */
+ mov %rdi, %r8
+@@ -366,8 +367,8 @@ L(gobble_256bytes_nt_loop):
+ cmp $256, %rdx
+ ja L(gobble_256bytes_nt_loop)
+ sfence
+- vmovups %zmm4, (%rax)
+- vmovups %zmm5, 0x40(%rax)
++ vmovups %zmm4, (%r11)
++ vmovups %zmm5, 0x40(%r11)
+ jmp L(check)
+
+ L(preloop_large_bkw):
+--
+2.7.4
+
diff --git a/meta/recipes-core/glibc/glibc_2.27.bb
b/meta/recipes-core/glibc/glibc_2.27.bb
index fe23eb6..b14c02c 100644
--- a/meta/recipes-core/glibc/glibc_2.27.bb
+++ b/meta/recipes-core/glibc/glibc_2.27.bb
@@ -46,6 +46,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
file://0030-plural_c_no_preprocessor_lines.patch \
file://CVE-2017-18269.patch \
file://CVE-2018-11236.patch \
+ file://CVE-2018-11237.patch \
"
NATIVESDKFIXES ?= ""
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/8][PATCH v2] update-rc.d: Add nativesdk
Add nativesdk for update-rc.d.
Signed-off-by: Zheng Ruoqin
---
meta/recipes-core/update-rc.d/update-rc.d_0.7.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
b/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
index 76d4312..d3d3e2f 100644
--- a/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
+++ b/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
@@ -30,4 +30,4 @@ do_install() {
install -m 0755 ${S}/update-rc.d ${D}${sbindir}/update-rc.d
}
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 8/8] [PATCH v2] meta-toolchain: Added dnf-nativesdk into cross-development toolchain.
Add dnf-nativesdk and it's runtime dependence to make dnf work on
cross-development environment.
Signed-off-by: Zheng Ruoqin
---
meta/classes/toolchain-scripts.bbclass | 1 +
meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb | 4
2 files changed, 5 insertions(+)
diff --git a/meta/classes/toolchain-scripts.bbclass
b/meta/classes/toolchain-scripts.bbclass
index 0ff5301..63a7ee4 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -97,6 +97,7 @@ toolchain_shared_env_script () {
echo 'export CPPFLAGS="${TARGET_CPPFLAGS}"' >> $script
echo 'export KCFLAGS="--sysroot=$SDKTARGETSYSROOT"' >> $script
echo 'export OECORE_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
+echo 'export MACHINE_ARCH=${MACHINE_ARCH}' >> $script
echo 'export OECORE_SDK_VERSION="${SDK_VERSION}"' >> $script
echo 'export ARCH=${ARCH}' >> $script
echo 'export CROSS_COMPILE=${TARGET_PREFIX}' >> $script
diff --git a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
index e2f6169..1370a82 100644
--- a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
+++ b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
@@ -25,6 +25,10 @@ RDEPENDS_${PN} = "\
nativesdk-cmake \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-wayland',
'', d)} \
nativesdk-sdk-provides-dummy \
+nativesdk-libnewt-python \
+nativesdk-createrepo-c \
+nativesdk-gpgme \
+nativesdk-update-rc.d \
"
RDEPENDS_${PN}_darwin = "\
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 7/8] [PATCH v2] rpm: Add DEPENDS for nativesdk.
Add DEPENDS for nativesdk.
Signed-off-by: Zheng Ruoqin
---
meta/recipes-devtools/rpm/rpm_4.14.1.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-devtools/rpm/rpm_4.14.1.bb
b/meta/recipes-devtools/rpm/rpm_4.14.1.bb
index e5e87d3..6ca5c94 100644
--- a/meta/recipes-devtools/rpm/rpm_4.14.1.bb
+++ b/meta/recipes-devtools/rpm/rpm_4.14.1.bb
@@ -52,6 +52,7 @@ S = "${WORKDIR}/git"
DEPENDS = "nss libarchive db file popt xz bzip2 dbus elfutils python3"
DEPENDS_append_class-native = " file-replacement-native
bzip2-replacement-native"
+DEPENDS_append_class-nativesdk = " file-replacement-nativesdk"
inherit autotools gettext pkgconfig python3native
export PYTHON_ABI
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/8][PATCH v2] createrepo-c: Add nativesdk
Add nativesdk for createrepo-c.
Signed-off-by: Zheng Ruoqin
---
meta/recipes-devtools/createrepo-c/createrepo-c_git.bb | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
b/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
index 3176136..9be9f9e 100644
--- a/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
+++ b/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
@@ -21,7 +21,7 @@ inherit cmake pkgconfig bash-completion distutils3-base
EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR}
-DPYTHON_DESIRED=3"
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
# Direct createrepo to read rpm configuration from our sysroot, not the one it
was compiled in
do_install_append_class-native() {
@@ -29,3 +29,8 @@ do_install_append_class-native() {
RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm
}
+do_install_append_class-nativesdk() {
+create_wrapper ${D}/${bindir}/createrepo_c \
+RPM_CONFIGDIR=${SDKPATHNATIVE}${libdir_nativesdk}/rpm
+rm -rf ${D}/etc
+}
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/8][PATCH v2] libnewt-python: Add PROVIDES for nativesdk.
Signed-off-by: Zheng Ruoqin
---
meta/recipes-devtools/file/file_5.32.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-devtools/file/file_5.32.bb
b/meta/recipes-devtools/file/file_5.32.bb
index 5e15925..9b13261 100644
--- a/meta/recipes-devtools/file/file_5.32.bb
+++ b/meta/recipes-devtools/file/file_5.32.bb
@@ -43,6 +43,8 @@ do_install_append_class-nativesdk() {
BBCLASSEXTEND = "native nativesdk"
PROVIDES_append_class-native = " file-replacement-native"
+PROVIDES_append_class-nativesdk = " file-replacement-nativesdk"
+
# Don't use NATIVE_PACKAGE_PATH_SUFFIX as that hides libmagic from anyone who
# depends on file-replacement-native.
bindir_append_class-native = "/file-native"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/8][PATCH v2] libnewt-python: Add nativesdk
Add nativesdk for libnewt-python.
Signed-off-by: Zheng Ruoqin
---
meta/recipes-extended/newt/libnewt-python_0.52.20.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-extended/newt/libnewt-python_0.52.20.bb
b/meta/recipes-extended/newt/libnewt-python_0.52.20.bb
index 20369ef..433d184 100644
--- a/meta/recipes-extended/newt/libnewt-python_0.52.20.bb
+++ b/meta/recipes-extended/newt/libnewt-python_0.52.20.bb
@@ -25,4 +25,4 @@ PACKAGES_remove = "whiptail"
FILES_${PN} = "${PYTHON_SITEPACKAGES_DIR}/*"
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/8] [PATCH v2]meta-toolchain: Added dnf-nativesdk into cross-development toolchain.
1. To make dnf work on cross-development environment. 2. To enable runtime dependencies for dnf-nativesdk. Zheng Ruoqin (8): [OE-core][PATCH v2] slang: add nativesdk [OE-core][PATCH v2] libnewt: Add nativesdk [OE-core][PATCH v2] libnewt-python: Add nativesdk [OE-core][PATCH v2] libnewt-python: Add PROVIDES for nativesdk. [OE-core][PATCH v2] createrepo-c: Add nativesdk [OE-core][PATCH v2] update-rc.d: Add nativesdk [OE-core][PATCH v2] rpm: Add DEPENDS for nativesdk. [OE-core][PATCH v2] meta-toolchain: Added dnf-nativesdk into cross-development toolchain. meta/classes/toolchain-scripts.bbclass | 1 + meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb | 4 meta/recipes-core/update-rc.d/update-rc.d_0.7.bb | 2 +- meta/recipes-devtools/createrepo-c/createrepo-c_git.bb | 7 ++- meta/recipes-devtools/file/file_5.32.bb| 2 ++ meta/recipes-devtools/rpm/rpm_4.14.1.bb| 1 + meta/recipes-extended/newt/libnewt-python_0.52.20.bb | 2 +- meta/recipes-extended/newt/libnewt_0.52.20.bb | 2 +- meta/recipes-extended/slang/slang_2.3.2.bb | 2 +- 9 files changed, 18 insertions(+), 5 deletions(-) -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/8][PATCH v2] slang: add nativesdk
Add nativesdk for slang.
Signed-off-by: Zheng Ruoqin
---
meta/recipes-extended/slang/slang_2.3.2.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-extended/slang/slang_2.3.2.bb
b/meta/recipes-extended/slang/slang_2.3.2.bb
index 87fd41a..e53c432 100644
--- a/meta/recipes-extended/slang/slang_2.3.2.bb
+++ b/meta/recipes-extended/slang/slang_2.3.2.bb
@@ -78,4 +78,4 @@ FILES_${PN} += "${libdir}/${BPN}/v2/modules/ ${datadir}/slsh/"
PARALLEL_MAKE = ""
PARALLEL_MAKEINST = ""
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/8][PATCH v2] libnewt: Add nativesdk
Add nativesdk for libnewt.
Signed-off-by: Zheng Ruoqin
---
meta/recipes-extended/newt/libnewt_0.52.20.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-extended/newt/libnewt_0.52.20.bb
b/meta/recipes-extended/newt/libnewt_0.52.20.bb
index 65ce70c..264ef3b 100644
--- a/meta/recipes-extended/newt/libnewt_0.52.20.bb
+++ b/meta/recipes-extended/newt/libnewt_0.52.20.bb
@@ -51,4 +51,4 @@ do_compile_prepend() {
FILES_whiptail = "${bindir}/whiptail"
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] meta-toolchain: Added dnf-nativesdk into cross-development toolchain.
Hi Alex： Yes, modifying the image recipe can actually customize your root file system, as linux vendors, they are familiar with bitbake and it's very easy to them. But, as I know, there are many users who are not very familiar with bitbake but also want to customize their root file system. And it's hard to make them learn how to use bitbake. So if dnf-nativesdk can be used in sdk, as linux vendors, they only need to provide rpm packages and sdk to users instead of teaching them how to use bitbake. At last, users can use dnf-nativesdk to manage their packages as what they do in their host. So I hope to add dnf-nativesdk in toolchain. -- Zheng Ruoqin Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) ADDR.: No.6 Wenzhu Road, Software Avenue, Nanjing, 210012, China MAIL : zhengrq.f...@cn.fujistu.com -Original Message- From: Alexander Kanavin [mailto:alex.kana...@gmail.com] Sent: Friday, June 15, 2018 12:27 PM To: Zheng, Ruoqin/郑 若钦 Cc: Burton, Ross ; OE-core Subject: Re: [OE-core] [PATCH] meta-toolchain: Added dnf-nativesdk into cross-development toolchain. What you describe is exactly what image creation does (either directly through bitbake, or via 'devtool build-image'). What benefits are in running dnf by hand from command line? If the idea is to hand pick packages to add to an image, then it's better to just modify the image recipe or use 'devtool build-image' if you are developing apps in a workspace. Alex 2018-06-15 4:39 GMT+03:00 Zheng, Ruoqin : > Hi Alex: > > These packages are taken from yocto build system, and they will be installed > in your host as root file system, then you can deploy the root file system to > your embedded device. > > -- > Zheng Ruoqin > Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) > ADDR.: No.6 Wenzhu Road, Software Avenue, >Nanjing, 210012, China > MAIL : zhengrq.f...@cn.fujistu.com > > > -Original Message- > From: Alexander Kanavin [mailto:alex.kana...@gmail.com] > Sent: Thursday, June 14, 2018 3:03 PM > To: Zheng, Ruoqin/郑 若钦 > Cc: Burton, Ross ; OE-core > > Subject: Re: [OE-core] [PATCH] meta-toolchain: Added dnf-nativesdk into > cross-development toolchain. > > 2018-06-14 6:38 GMT+03:00 Zheng, Ruoqin : >> I submitted this patch aim to use dnf out of Yocto build system to manage >> packages. > > Please explain this in detail. Where are the packages taken from, and where > are they installed? > > Alex > > > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] meta-toolchain: Added dnf-nativesdk into cross-development toolchain.
Hi Alex: These packages are taken from yocto build system, and they will be installed in your host as root file system, then you can deploy the root file system to your embedded device. -- Zheng Ruoqin Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) ADDR.: No.6 Wenzhu Road, Software Avenue, Nanjing, 210012, China MAIL : zhengrq.f...@cn.fujistu.com -Original Message- From: Alexander Kanavin [mailto:alex.kana...@gmail.com] Sent: Thursday, June 14, 2018 3:03 PM To: Zheng, Ruoqin/郑 若钦 Cc: Burton, Ross ; OE-core Subject: Re: [OE-core] [PATCH] meta-toolchain: Added dnf-nativesdk into cross-development toolchain. 2018-06-14 6:38 GMT+03:00 Zheng, Ruoqin : > I submitted this patch aim to use dnf out of Yocto build system to manage > packages. Please explain this in detail. Where are the packages taken from, and where are they installed? Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] meta-toolchain: Added dnf-nativesdk into cross-development toolchain.
Hi Ross：
I submitted this patch aim to use dnf out of Yocto build system to manage
packages.
So I need to add dnf-nativesdk into cross-development toolchain.
My plan is as following:
Step 1. Add dnf-nativesdk into cross-development toolchain to support using dnf
command line.
Step 2. Add Text-based UI for dnf to make it more flexible and user friendly.
Finally, about the usage of dnf-nativesdk, please reference to
https://github.com/ubinux/dnf/tree/dnf-yocto2.5 .
In V2 patch, I will split V1 patch up into multiple patches.
I'm glad to hear your advice.
--
Zheng Ruoqin
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
ADDR.: No.6 Wenzhu Road, Software Avenue,
Nanjing, 210012, China
MAIL : zhengrq.f...@cn.fujistu.com
-Original Message-
From: Burton, Ross [mailto:ross.bur...@intel.com]
Sent: Monday, June 11, 2018 5:56 PM
To: Zheng, Ruoqin/郑 若钦
Cc: OE-core
Subject: Re: [OE-core] [PATCH] meta-toolchain: Added dnf-nativesdk into
cross-development toolchain.
Please split this up into multiple patches: slang, libnewt, etc. Also what's
the use-case for using a nativesdk-dnf? How is that useful?
Ross
On 28 May 2018 at 11:20, Zheng Ruoqin wrote:
> To make dnf work on cross-development environment.
>
> Signed-off-by: Zheng Ruoqin
> ---
> meta/classes/toolchain-scripts.bbclass | 1 +
> .../nativesdk-packagegroup-sdk-host.bb | 4 +++
> meta/recipes-core/update-rc.d/update-rc.d_0.7.bb | 2 +-
> .../createrepo-c/createrepo-c_git.bb | 7 -
> meta/recipes-devtools/file/file_5.32.bb| 2 ++
> meta/recipes-devtools/rpm/rpm_4.14.1.bb| 34
> ++
> .../newt/libnewt-python_0.52.20.bb | 2 +-
> meta/recipes-extended/newt/libnewt_0.52.20.bb | 2 +-
> meta/recipes-extended/slang/slang_2.3.2.bb | 2 +-
> 9 files changed, 46 insertions(+), 10 deletions(-)
>
> diff --git a/meta/classes/toolchain-scripts.bbclass
> b/meta/classes/toolchain-scripts.bbclass
> index 71da5e5..58dd00e 100644
> --- a/meta/classes/toolchain-scripts.bbclass
> +++ b/meta/classes/toolchain-scripts.bbclass
> @@ -97,6 +97,7 @@ toolchain_shared_env_script () {
> echo 'export CPPFLAGS="${TARGET_CPPFLAGS}"' >> $script
> echo 'export KCFLAGS="--sysroot=$SDKTARGETSYSROOT"' >> $script
> echo 'export OECORE_DISTRO_VERSION="${DISTRO_VERSION}"' >>
> $script
> +echo 'export MACHINE_ARCH=${MACHINE_ARCH}' >> $script
> echo 'export OECORE_SDK_VERSION="${SDK_VERSION}"' >> $script
> echo 'export ARCH=${ARCH}' >> $script
> echo 'export CROSS_COMPILE=${TARGET_PREFIX}' >> $script diff
> --git
> a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
> b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
> index e2f6169..1370a82 100644
> ---
> a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
> +++ b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.
> +++ bb
> @@ -25,6 +25,10 @@ RDEPENDS_${PN} = "\
> nativesdk-cmake \
> ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-wayland',
> '', d)} \
> nativesdk-sdk-provides-dummy \
> +nativesdk-libnewt-python \
> +nativesdk-createrepo-c \
> +nativesdk-gpgme \
> +nativesdk-update-rc.d \
> "
>
> RDEPENDS_${PN}_darwin = "\
> diff --git a/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
> b/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
> index 76d4312..d3d3e2f 100644
> --- a/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
> +++ b/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
> @@ -30,4 +30,4 @@ do_install() {
> install -m 0755 ${S}/update-rc.d ${D}${sbindir}/update-rc.d }
>
> -BBCLASSEXTEND = "native"
> +BBCLASSEXTEND = "native nativesdk"
> diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
> b/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
> index 3176136..9be9f9e 100644
> --- a/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
> +++ b/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
> @@ -21,7 +21,7 @@ inherit cmake pkgconfig bash-completion
> distutils3-base
>
> EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR}
> -DPYTHON_DESIRED=3"
>
> -BBCLASSEXTEND = "native"
> +BBCLASSEXTEND = "native nativesdk"
>
> # Direct createrepo to read rpm configuration from our sysroot, not
> the one it was compiled in
> do_install_append_class-native() {
> @@ -29,3 +29,8 @@ do_install_append_class-native() {
>
Re: [OE-core] [PATCH] meta-toolchain: Added dnf-nativesdk into cross-development toolchain.
Ping
--
Zheng Ruoqin
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
ADDR.: No.6 Wenzhu Road, Software Avenue,
Nanjing, 210012, China
MAIL : zhengrq.f...@cn.fujistu.com
-Original Message-
From: Zheng, Ruoqin/郑 若钦
Sent: Monday, May 28, 2018 6:21 PM
To: openembedded-core@lists.openembedded.org
Cc: Zheng, Ruoqin/郑 若钦
Subject: [OE-core][PATCH] meta-toolchain: Added dnf-nativesdk into
cross-development toolchain.
To make dnf work on cross-development environment.
Signed-off-by: Zheng Ruoqin
---
meta/classes/toolchain-scripts.bbclass | 1 +
.../nativesdk-packagegroup-sdk-host.bb | 4 +++
meta/recipes-core/update-rc.d/update-rc.d_0.7.bb | 2 +-
.../createrepo-c/createrepo-c_git.bb | 7 -
meta/recipes-devtools/file/file_5.32.bb| 2 ++
meta/recipes-devtools/rpm/rpm_4.14.1.bb| 34 ++
.../newt/libnewt-python_0.52.20.bb | 2 +-
meta/recipes-extended/newt/libnewt_0.52.20.bb | 2 +-
meta/recipes-extended/slang/slang_2.3.2.bb | 2 +-
9 files changed, 46 insertions(+), 10 deletions(-)
diff --git a/meta/classes/toolchain-scripts.bbclass
b/meta/classes/toolchain-scripts.bbclass
index 71da5e5..58dd00e 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -97,6 +97,7 @@ toolchain_shared_env_script () {
echo 'export CPPFLAGS="${TARGET_CPPFLAGS}"' >> $script
echo 'export KCFLAGS="--sysroot=$SDKTARGETSYSROOT"' >> $script
echo 'export OECORE_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
+echo 'export MACHINE_ARCH=${MACHINE_ARCH}' >> $script
echo 'export OECORE_SDK_VERSION="${SDK_VERSION}"' >> $script
echo 'export ARCH=${ARCH}' >> $script
echo 'export CROSS_COMPILE=${TARGET_PREFIX}' >> $script diff --git
a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
index e2f6169..1370a82 100644
--- a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
+++ b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
@@ -25,6 +25,10 @@ RDEPENDS_${PN} = "\
nativesdk-cmake \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-wayland',
'', d)} \
nativesdk-sdk-provides-dummy \
+nativesdk-libnewt-python \
+nativesdk-createrepo-c \
+nativesdk-gpgme \
+nativesdk-update-rc.d \
"
RDEPENDS_${PN}_darwin = "\
diff --git a/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
b/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
index 76d4312..d3d3e2f 100644
--- a/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
+++ b/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
@@ -30,4 +30,4 @@ do_install() {
install -m 0755 ${S}/update-rc.d ${D}${sbindir}/update-rc.d }
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
b/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
index 3176136..9be9f9e 100644
--- a/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
+++ b/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
@@ -21,7 +21,7 @@ inherit cmake pkgconfig bash-completion distutils3-base
EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR}
-DPYTHON_DESIRED=3"
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
# Direct createrepo to read rpm configuration from our sysroot, not the one it
was compiled in
do_install_append_class-native() {
@@ -29,3 +29,8 @@ do_install_append_class-native() {
RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm
}
+do_install_append_class-nativesdk() {
+create_wrapper ${D}/${bindir}/createrepo_c \
+RPM_CONFIGDIR=${SDKPATHNATIVE}${libdir_nativesdk}/rpm
+rm -rf ${D}/etc
+}
diff --git a/meta/recipes-devtools/file/file_5.32.bb
b/meta/recipes-devtools/file/file_5.32.bb
index 5e15925..9b13261 100644
--- a/meta/recipes-devtools/file/file_5.32.bb
+++ b/meta/recipes-devtools/file/file_5.32.bb
@@ -43,6 +43,8 @@ do_install_append_class-nativesdk() {
BBCLASSEXTEND = "native nativesdk"
PROVIDES_append_class-native = " file-replacement-native"
+PROVIDES_append_class-nativesdk = " file-replacement-nativesdk"
+
# Don't use NATIVE_PACKAGE_PATH_SUFFIX as that hides libmagic from anyone who
# depends on file-replacement-native.
bindir_append_class-native = "/file-native"
diff --git a/meta/recipes-devtools/rpm/rpm_4.14.1.bb
b/meta/recipes-devtools/rpm/rpm_4.14.1.bb
index d49530e..abcad9f 100644
--- a/meta/recipes-devtools/rpm/rpm_4.14.1.bb
+++ b/meta/recipes-devtools/rpm/rpm_4.14.1.bb
@@ -50,6 +50,7 @@ S = "${WORKDIR}/git"
[OE-core] [PATCH] meta-toolchain: Added dnf-nativesdk into cross-development toolchain.
To make dnf work on cross-development environment.
Signed-off-by: Zheng Ruoqin <zhengrq.f...@cn.fujitsu.com>
---
meta/classes/toolchain-scripts.bbclass | 1 +
.../nativesdk-packagegroup-sdk-host.bb | 4 +++
meta/recipes-core/update-rc.d/update-rc.d_0.7.bb | 2 +-
.../createrepo-c/createrepo-c_git.bb | 7 -
meta/recipes-devtools/file/file_5.32.bb| 2 ++
meta/recipes-devtools/rpm/rpm_4.14.1.bb| 34 ++
.../newt/libnewt-python_0.52.20.bb | 2 +-
meta/recipes-extended/newt/libnewt_0.52.20.bb | 2 +-
meta/recipes-extended/slang/slang_2.3.2.bb | 2 +-
9 files changed, 46 insertions(+), 10 deletions(-)
diff --git a/meta/classes/toolchain-scripts.bbclass
b/meta/classes/toolchain-scripts.bbclass
index 71da5e5..58dd00e 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -97,6 +97,7 @@ toolchain_shared_env_script () {
echo 'export CPPFLAGS="${TARGET_CPPFLAGS}"' >> $script
echo 'export KCFLAGS="--sysroot=$SDKTARGETSYSROOT"' >> $script
echo 'export OECORE_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
+echo 'export MACHINE_ARCH=${MACHINE_ARCH}' >> $script
echo 'export OECORE_SDK_VERSION="${SDK_VERSION}"' >> $script
echo 'export ARCH=${ARCH}' >> $script
echo 'export CROSS_COMPILE=${TARGET_PREFIX}' >> $script
diff --git a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
index e2f6169..1370a82 100644
--- a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
+++ b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
@@ -25,6 +25,10 @@ RDEPENDS_${PN} = "\
nativesdk-cmake \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-wayland',
'', d)} \
nativesdk-sdk-provides-dummy \
+nativesdk-libnewt-python \
+nativesdk-createrepo-c \
+nativesdk-gpgme \
+nativesdk-update-rc.d \
"
RDEPENDS_${PN}_darwin = "\
diff --git a/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
b/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
index 76d4312..d3d3e2f 100644
--- a/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
+++ b/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
@@ -30,4 +30,4 @@ do_install() {
install -m 0755 ${S}/update-rc.d ${D}${sbindir}/update-rc.d
}
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
b/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
index 3176136..9be9f9e 100644
--- a/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
+++ b/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
@@ -21,7 +21,7 @@ inherit cmake pkgconfig bash-completion distutils3-base
EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR}
-DPYTHON_DESIRED=3"
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
# Direct createrepo to read rpm configuration from our sysroot, not the one it
was compiled in
do_install_append_class-native() {
@@ -29,3 +29,8 @@ do_install_append_class-native() {
RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm
}
+do_install_append_class-nativesdk() {
+create_wrapper ${D}/${bindir}/createrepo_c \
+RPM_CONFIGDIR=${SDKPATHNATIVE}${libdir_nativesdk}/rpm
+rm -rf ${D}/etc
+}
diff --git a/meta/recipes-devtools/file/file_5.32.bb
b/meta/recipes-devtools/file/file_5.32.bb
index 5e15925..9b13261 100644
--- a/meta/recipes-devtools/file/file_5.32.bb
+++ b/meta/recipes-devtools/file/file_5.32.bb
@@ -43,6 +43,8 @@ do_install_append_class-nativesdk() {
BBCLASSEXTEND = "native nativesdk"
PROVIDES_append_class-native = " file-replacement-native"
+PROVIDES_append_class-nativesdk = " file-replacement-nativesdk"
+
# Don't use NATIVE_PACKAGE_PATH_SUFFIX as that hides libmagic from anyone who
# depends on file-replacement-native.
bindir_append_class-native = "/file-native"
diff --git a/meta/recipes-devtools/rpm/rpm_4.14.1.bb
b/meta/recipes-devtools/rpm/rpm_4.14.1.bb
index d49530e..abcad9f 100644
--- a/meta/recipes-devtools/rpm/rpm_4.14.1.bb
+++ b/meta/recipes-devtools/rpm/rpm_4.14.1.bb
@@ -50,6 +50,7 @@ S = "${WORKDIR}/git"
DEPENDS = "nss libarchive db file popt xz bzip2 dbus elfutils python3"
DEPENDS_append_class-native = " file-replacement-native
bzip2-replacement-native"
+DEPENDS_append_class-nativesdk = " file-replacement-nativesdk"
inherit autotools gettext pkgconfig python3native
export PYTHON_ABI
@@ -67,6 +68,7 @@ EXTRA_OECONF_append_libc-musl = " --disable-nls"
# Disable dbus for native, so that rpm doesn'
[OE-core] question: Use systemd as the default initialization manager
Hi All： By default, the Yocto Project uses SysVinit as the initialization manager. However, systemd is used by many distributions and it's supported in Yocto. Why didn't use systemd as the default initialization manager? -- Zheng Ruoqin Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) ADDR.: No.6 Wenzhu Road, Software Avenue, Nanjing, 210012, China MAIL : zhengrq.f...@cn.fujistu.com -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] [PATCH] sqlite3:3.22.0->3.23.1
Upgrade sqlite3 from 3.22.0 to 3.23.1.
Signed-off-by: Zheng Ruoqin <zhengrq.f...@cn.fujitsu.com>
---
meta/recipes-support/sqlite/{sqlite3_3.22.0.bb => sqlite3_3.23.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/sqlite/{sqlite3_3.22.0.bb => sqlite3_3.23.1.bb}
(59%)
diff --git a/meta/recipes-support/sqlite/sqlite3_3.22.0.bb
b/meta/recipes-support/sqlite/sqlite3_3.23.1.bb
similarity index 59%
rename from meta/recipes-support/sqlite/sqlite3_3.22.0.bb
rename to meta/recipes-support/sqlite/sqlite3_3.23.1.bb
index ef88659..3755761 100644
--- a/meta/recipes-support/sqlite/sqlite3_3.22.0.bb
+++ b/meta/recipes-support/sqlite/sqlite3_3.23.1.bb
@@ -6,5 +6,5 @@ LIC_FILES_CHKSUM =
"file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed0
SRC_URI = "\
http://www.sqlite.org/2018/sqlite-autoconf-${SQLITE_PV}.tar.gz \
"
-SRC_URI[md5sum] = "96b5648d542e8afa6ab7ffb8db8ddc3d"
-SRC_URI[sha256sum] =
"2824ab1238b706bc66127320afbdffb096361130e23291f26928a027b885c612"
+SRC_URI[md5sum] = "99a51b40a66872872a91c92f6d0134fa"
+SRC_URI[sha256sum] =
"92842b283e5e744eff5da29ed3c69391de7368fccc4d0ee6bf62490ce555ef25"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] [PATCH] wayland: 1.14.0 -> 1.15.0
Upgrade wayland from 1.14.0 to 1.15.0.
Signed-off-by: Zheng Ruoqin <zhengrq.f...@cn.fujitsu.com>
---
.../recipes-graphics/wayland/{wayland_1.14.0.bb => wayland_1.15.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/wayland/{wayland_1.14.0.bb => wayland_1.15.0.bb}
(92%)
diff --git a/meta/recipes-graphics/wayland/wayland_1.14.0.bb
b/meta/recipes-graphics/wayland/wayland_1.15.0.bb
similarity index 92%
rename from meta/recipes-graphics/wayland/wayland_1.14.0.bb
rename to meta/recipes-graphics/wayland/wayland_1.15.0.bb
index 1a9ff98..788105b 100644
--- a/meta/recipes-graphics/wayland/wayland_1.14.0.bb
+++ b/meta/recipes-graphics/wayland/wayland_1.15.0.bb
@@ -15,8 +15,8 @@ DEPENDS = "expat libxml2 libffi wayland-native"
SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
file://fixpathinpcfiles.patch \
"
-SRC_URI[md5sum] = "0235f6075c32c3be61cff94fa0b9f108"
-SRC_URI[sha256sum] =
"ed80cabc0961a759a42092e2c39aabfc1ec9a13c86c98bbe2b812f008da27ab8"
+SRC_URI[md5sum] = "b7393c17fdce9a8d383edab656c92fd2"
+SRC_URI[sha256sum] =
"eb3fbebb8559d56a80ad3753ec3db800f587329067962dbf65e14488b4b7aeb0"
inherit autotools pkgconfig
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] question about libgcrypt
Hi Anuj, How to change wireshark configure to use pkg-config for libgcrypt? Thanks -- Zheng Ruoqin Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) ADDR.: No.6 Wenzhu Road, Software Avenue, Nanjing, 210012, China MAIL : zhengrq.f...@cn.fujistu.com -Original Message- From: Anuj Mittal [mailto:anuj.mit...@intel.com] Sent: Friday, March 30, 2018 6:33 PM To: Zheng, Ruoqin/郑 若钦 <zhengrq.f...@cn.fujitsu.com>; openembedded-core@lists.openembedded.org Subject: Re: [OE-core] question about libgcrypt Hi Ruoqin, On 03/30/2018 06:10 PM, Zheng, Ruoqin wrote: > Hi, > > I got the following error when building wireshark 2.4.5 during do_configure, > .. > | checking for libgcrypt-config... > /yocto/work001/fnst/huangqy/upgrade/build/tmp/work/i586-poky-linux/wireshark/1_2.4.5-r0/recipe-sysroot/usr/bin/crossscripts/libgcrypt-config > | checking for LIBGCRYPT - version >= 1.4.2... ERROR: > /usr/bin/libgcrypt-config should not be used, use an alternative such as > pkg-config > | ../wireshark-2.4.5/configure: line 20214: test: > --should-not-have-used-/usr/bin/libgcrypt-config: integer expression expected > | ../wireshark-2.4.5/configure: line 20217: test: > --should-not-have-used-/usr/bin/libgcrypt-config: integer expression expected > . You will have to change wireshark configure to use pkg-config for libgcrypt instead of relying on binconfig file to get the version and flags. Thanks, Anuj -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] question about libgcrypt
Hi, I got the following error when building wireshark 2.4.5 during do_configure, .. | checking for libgcrypt-config... /yocto/work001/fnst/huangqy/upgrade/build/tmp/work/i586-poky-linux/wireshark/1_2.4.5-r0/recipe-sysroot/usr/bin/crossscripts/libgcrypt-config | checking for LIBGCRYPT - version >= 1.4.2... ERROR: /usr/bin/libgcrypt-config should not be used, use an alternative such as pkg-config | ../wireshark-2.4.5/configure: line 20214: test: --should-not-have-used-/usr/bin/libgcrypt-config: integer expression expected | ../wireshark-2.4.5/configure: line 20217: test: --should-not-have-used-/usr/bin/libgcrypt-config: integer expression expected . And I found it's caused by libgcrypt-config as follows #!/bin/sh echo 'ERROR: /usr/bin/libgcrypt-config should not be used, use an alternative such as pkg-config' >&2 echo '--should-not-have-used-/usr/bin/libgcrypt-config' exit 1 I think this error is caused by libgcrypt, it creates the wrong file, does anyone have any idea about this? ------ Zheng Ruoqin Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) ADDR.: No.6 Wenzhu Road, Software Avenue, Nanjing, 210012, China MAIL : zhengrq.f...@cn.fujistu.com -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] libyui
Hi Ross! Where should I put this recipe? -- Zheng Ruoqin Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) ADDR.: No.6 Wenzhu Road, Software Avenue, Nanjing, 210012, China MAIL : zhengrq.f...@cn.fujistu.com From: Burton, Ross [mailto:ross.bur...@intel.com] Sent: Monday, December 04, 2017 6:17 PM To: Zheng, Ruoqin/郑 若钦 <zhengrq.f...@cn.fujitsu.com> Cc: Alexander Kanavin <alexander.kana...@linux.intel.com>; openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH] libyui Again, it sounds like this should be in another layer. Ross On 4 December 2017 at 02:01, Zheng, Ruoqin <zhengrq.f...@cn.fujitsu.com<mailto:zhengrq.f...@cn.fujitsu.com>> wrote: Hi Alex: I attend to make dnfdragora(which is a gui for dnf) used in oe-core, and libyui is the depend of dnfdragora. ---------- Zheng Ruoqin Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) ADDR.: No.6 Wenzhu Road, Software Avenue, Nanjing, 210012, China MAIL : zhengrq.f...@cn.fujistu.com<mailto:zhengrq.f...@cn.fujistu.com> -Original Message- From: Alexander Kanavin [mailto:alexander.kana...@linux.intel.com<mailto:alexander.kana...@linux.intel.com>] Sent: Wednesday, November 29, 2017 2:48 PM To: Zheng, Ruoqin/郑 若钦 <zhengrq.f...@cn.fujitsu.com<mailto:zhengrq.f...@cn.fujitsu.com>>; openembedded-core@lists.openembedded.org<mailto:openembedded-core@lists.openembedded.org> Subject: Re: [OE-core] [PATCH] libyui On 11/29/2017 07:10 AM, zhengrq wrote: > Add a new recipe libyui. Add why? What does it do? Why should it be in oe-core? Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org<mailto:Openembedded-core@lists.openembedded.org> http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] libyui
Hi Alex: I attend to make dnfdragora(which is a gui for dnf) used in oe-core, and libyui is the depend of dnfdragora. -- Zheng Ruoqin Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) ADDR.: No.6 Wenzhu Road, Software Avenue, Nanjing, 210012, China MAIL : zhengrq.f...@cn.fujistu.com -Original Message- From: Alexander Kanavin [mailto:alexander.kana...@linux.intel.com] Sent: Wednesday, November 29, 2017 2:48 PM To: Zheng, Ruoqin/郑 若钦 <zhengrq.f...@cn.fujitsu.com>; openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH] libyui On 11/29/2017 07:10 AM, zhengrq wrote: > Add a new recipe libyui. Add why? What does it do? Why should it be in oe-core? Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] python-setuptools: update to 36.7.2
Hi Ross
Is it means that I should make a new patch for python3-setuptools?
--
Zheng Ruoqin
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
ADDR.: No.6 Wenzhu Road, Software Avenue,
Nanjing, 210012, China
MAIL : zhengrq.f...@cn.fujistu.com
From: Burton, Ross [mailto:ross.bur...@intel.com]
Sent: Friday, November 17, 2017 7:18 AM
To: Zheng, Ruoqin/郑 若钦 <zhengrq.f...@cn.fujitsu.com>
Cc: OE-core <openembedded-core@lists.openembedded.org>
Subject: Re: [OE-core] [PATCH] python-setuptools: update to 36.7.2
python3-setuptools includes this file too, so this patch breaks that recipe.
Ross
On 16 November 2017 at 09:11, zhengrq
<zhengrq.f...@cn.fujitsu.com<mailto:zhengrq.f...@cn.fujitsu.com>> wrote:
1) Upgrade python-setuptools from 36.5.0 to 36.7.2.
Signed-off-by: Zheng Ruoqin
<zhengrq.f...@cn.fujitsu.com<mailto:zhengrq.f...@cn.fujitsu.com>>
---
meta/recipes-devtools/python/python-setuptools.inc| 4 ++--
.../{python-setuptools_36.5.0.bb<http://python-setuptools_36.5.0.bb> =>
python-setuptools_36.7.2.bb<http://python-setuptools_36.7.2.bb>} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
rename
meta/recipes-devtools/python/{python-setuptools_36.5.0.bb<http://python-setuptools_36.5.0.bb>
=> python-setuptools_36.7.2.bb<http://python-setuptools_36.7.2.bb>} (100%)
diff --git a/meta/recipes-devtools/python/python-setuptools.inc
b/meta/recipes-devtools/python/python-setuptools.inc
index 1eae0b6..56b17ad 100644
--- a/meta/recipes-devtools/python/python-setuptools.inc
+++ b/meta/recipes-devtools/python/python-setuptools.inc
@@ -9,8 +9,8 @@ SRCNAME = "setuptools"
SRC_URI =
"https://files.pythonhosted.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.zip<https://files.pythonhosted.org/packages/source/s/$%7bSRCNAME%7d/$%7bSRCNAME%7d-$%7bPV%7d.zip>"
-SRC_URI[md5sum] = "704f500dd55f4bd0be905444f3ba892c"
-SRC_URI[sha256sum] =
"ce2007c1cea3359870b80657d634253a0765b0c7dc5a988d77ba803fc86f2c64"
+SRC_URI[md5sum] = "1874983171af0f7b16b5ec48558e6e55"
+SRC_URI[sha256sum] =
"ad86fd8dd09c285c33b4c5b82bbc21d21883637faef78b0ab58fa9984847220d"
UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/setuptools;
diff --git
a/meta/recipes-devtools/python/python-setuptools_36.5.0.bb<http://python-setuptools_36.5.0.bb>
b/meta/recipes-devtools/python/python-setuptools_36.7.2.bb<http://python-setuptools_36.7.2.bb>
similarity index 100%
rename from
meta/recipes-devtools/python/python-setuptools_36.5.0.bb<http://python-setuptools_36.5.0.bb>
rename to
meta/recipes-devtools/python/python-setuptools_36.7.2.bb<http://python-setuptools_36.7.2.bb>
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org<mailto:Openembedded-core@lists.openembedded.org>
http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] do_fetch problem of linux-yocto
Hi All： When I bitbake linux-yocto，it can’t fetch the git-repo. But actually, the git-repo has been fetched. ERROR: linux-yocto-4.12.14+gitAUTOINC+cebe198870_9cc6b0ae1a-r0 do_fetch: Fetcher failure for URL: 'git://git.yoctoproject.org/linux-yocto-4.12.git;name=machine;branch=standard/base;'. Unable to fetch URL from any source. ERROR: linux-yocto-4.12.14+gitAUTOINC+cebe198870_9cc6b0ae1a-r0 do_fetch: Function failed: base_do_fetch ERROR: Logfile of failure stored in: /yocto/work001/fnst/zrq/community/build_master/tmp/work/qemux86-poky-linux/linux-yocto/4.12.14+gitAUTOINC+cebe198870_9cc6b0ae1a-r0/temp/log.do_fetch.24508 ERROR: Task (/yocto/work001/fnst/zrq/community/yocto/poky/meta/recipes-kernel/linux/linux-yocto_4.12.bb:do_fetch) failed with exit code '1' $ls downloads/git2/git.yoctoproject.org.git.yocto-kernel-tools.git/ branches config description HEAD hooks info objects packed-refs refs And when I re bitbake the task, do_fetch will be done again. does anyone knows the reason? bitbake linux-yocto 2: linux-yocto-4.12.14+gitAUTOINC+cebe198870_9cc6b0ae1a-r0 do_fetch (pid 28864) 0% | | 92.5K/s Zheng Ruoqin Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) ADDR.: No.6 Wenzhu Road, Software Avenue, Nanjing, 210012, China MAIL : zhengrq.f...@cn.fujistu.com -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] do_configure problem about freerdp
Hi All： When I bitbake the freerdp, I met the depends problem about gstreame in do_configure， do anyone know the reason？ Here is the log： | -- Checking for module 'gstreamer-app-1.0 >= ' | -- Comparison operator but no version after package name 'gstreamer-app-1.0' in file '(command line arguments)' | -- Checking for module 'gstreamer-audio-1.0 >= ' | -- Comparison operator but no version after package name 'gstreamer-audio-1.0' in file '(command line arguments)' | -- Checking for module 'gstreamer-fft-1.0 >= ' | -- Comparison operator but no version after package name 'gstreamer-fft-1.0' in file '(command line arguments)' | -- Checking for module 'gstreamer-pbutils-1.0 >= ' | -- Comparison operator but no version after package name 'gstreamer-pbutils-1.0' in file '(command line arguments)' | -- Checking for module 'gstreamer-video-1.0 >= ' | -- Comparison operator but no version after package name 'gstreamer-video-1.0' in file '(command line arguments)' | -- Could NOT find GSTREAMER_1_0 (missing: GSTREAMER_1_0_INCLUDE_DIRS) | CMake Warning at cmake/FindFeature.cmake:46 (message): | feature GStreamer_1_0 was requested but could not be found! ON / FALSE | Call Stack (most recent call first): | CMakeLists.txt:625 (find_feature) | | | -- Skipping optional feature JPEG for codec (use JPEG library) | -- Enable feature JPEG using "-DWITH_JPEG=ON" | -- Skipping optional feature x264 for codec (use x264 library) | -- Enable feature x264 using "-DWITH_X264=ON" | -- Skipping optional feature OpenH264 for codec (use OpenH264 library) | -- Enable feature OpenH264 using "-DWITH_OPENH264=ON" | -- Skipping optional feature GSM for codec (GSM audio codec library) | -- Enable feature GSM using "-DWITH_GSM=ON" | -- FreeRDP GIT | -- Finding recommended feature XKBFile for X11 keyboard (X11 keyboard file extension) | -- Disable feature XKBFile using "-DWITH_XKBFILE=OFF" | -- Found XKBFile: /yocto/work001/fnst/zrq/community/build_master/tmp/work/i586-poky-linux/freerdp/1.2.5+gitrAUTOINC+62da9d28c6-r0/recipe-sysroot/usr/lib/libxkbfile.so | -- FreeRDP GIT | -- Adding dynamic channel client server "audin": Audio Input Redirection Virtual Channel Extension | -- Adding static channel client server "cliprdr": Clipboard Virtual Channel Extension | -- Adding dynamic channel client "disp": Display Update Virtual Channel Extension | -- Adding static channel client server "drdynvc": Dynamic Virtual Channel Extension | -- Adding device channel client "drive": Drive Redirection Virtual Channel Extension | -- Adding dynamic channel client server "echo": Echo Virtual Channel Extension | -- Adding static channel client server "encomsp": Multiparty Virtual Channel Extension | -- Adding device channel client "parallel": Parallel Port Virtual Channel Extension | -- Adding device channel client "printer": Print Virtual Channel Extension | -- Adding static channel client "rail": Remote Programs Virtual Channel Extension | -- Adding static channel client server "rdpdr": Device Redirection Virtual Channel Extension | -- Adding dynamic channel client "rdpei": Input Virtual Channel Extension | -- Adding dynamic channel client "rdpgfx": Graphics Pipeline Extension | -- Adding static channel client server "rdpsnd": Audio Output Virtual Channel Extension | -- Adding static channel client server "remdesk": Remote Assistance Virtual Channel Extension | -- Adding device channel client "serial": Serial Port Virtual Channel Extension | -- Adding device channel client "smartcard": Smart Card Virtual Channel Extension | -- Adding dynamic channel client "tsmf": Video Redirection Virtual Channel Extension | -- Finding required feature XRandR for X11 randr (X11 randr extension) | -- Found XRANDR: /yocto/work001/fnst/zrq/community/build_master/tmp/work/i586-poky-linux/freerdp/1.2.5+gitrAUTOINC+62da9d28c6-r0/recipe-sysroot/usr/lib/libXrandr.so | CMake Error at channels/tsmf/client/gstreamer/CMakeLists.txt:21 (message): | GStreamer library not found, but required for TSMF module. | | | -- Configuring incomplete, errors occurred! | See also "/yocto/work001/fnst/zrq/community/build_master/tmp/work/i586-poky-linux/freerdp/1.2.5+gitrAUTOINC+62da9d28c6-r0/build/CMakeFiles/CMakeOutput.log". | See also "/yocto/work001/fnst/zrq/community/build_master/tmp/work/i586-poky-linux/freerdp/1.2.5+gitrAUTOINC+62da9d28c6-r0/build/CMakeFiles/CMakeError.log". | WARNING: exit code 1 from a shell command. | ERROR: Function failed: do_configure (log file is located at /yocto/work001/fnst/zrq/community/build_master/tmp/work/i586-poky-linux/freerdp/1.2.5+gitrAUTOINC+62da9d28c6-r0/temp/log.do_configure.28012) ERROR: Task (/yocto/work001/fnst/zrq/communit
Re: [OE-core] [PATCH v3] (morty) rpm: Fix the Bug of SRPM String error
ping
-Original Message-
From: Zheng, Ruoqin/郑 若钦
Sent: Friday, June 23, 2017 9:56 AM
To: openembedded-core@lists.openembedded.org
Cc: Zheng, Ruoqin/郑 若钦 <zhengrq.f...@cn.fujitsu.com>
Subject: [OE-core] [PATCH v3] (morty) rpm: Fix the Bug of SRPM String error
Add a patch 0001-Fix-the-Bug-of-SRPM-String-error.patch to fix SRPM bug
When use bitbake to build a SRPM package, some sections of SRPM can't be
displayed normally.
For example:
$ rpm -qpi bash-4.3.30-r0.src.rpm
warning: bash-4.3.30-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID 0a868e8e:
NOKEY
Name: bash
Version : 4.3.30
Release : r0
Architecture: i586
Install Date: (not installed)
Group : Ô¯
Size: 8413797
License : GPLv3+
Signature : DSA/SHA1, Wed 21 Jun 2017 07:37:52 PM PDT, Key ID 609104e40a868e8e
Source RPM : (none)
Build Date : Wed 21 Jun 2017 07:37:52 PM PDT Build Host : ubuntu Relocations
: (not relocatable)
Packager: Poky <p...@yoctoproject.org>
URL : http://tiswww.case.edu/php/chet/bash/bashtop.html
Summary : 8
Description :
8
Signed-off-by: zhengrq <zhengrq.f...@cn.fujitsu.com>
---
.../0001-Fix-the-Bug-of-SRPM-String-error.patch| 48 ++
meta/recipes-devtools/rpm/rpm_5.4.16.bb| 1 +
2 files changed, 49 insertions(+)
create mode 100644
meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch
diff --git
a/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch
b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch
new file mode 100644
index 000..b962617
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-erro
+++ r.patch
@@ -0,0 +1,48 @@
+Subject: [PATCH] Fix the Bug of SRPM String error
+
+Upstream-Status: Pending
+$ rpm -qpi bash-4.3.30-r0.src.rpm
+warning: bash-4.3.30-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID
0a868e8e: NOKEY
+Name: bash
+Version : 4.3.30
+Release : r0
+Architecture: i586
+Install Date: (not installed)
+Group : Ô¯
+Size: 8413797
+License : GPLv3+
+Signature : DSA/SHA1, Wed 21 Jun 2017 07:37:52 PM PDT, Key ID
609104e40a868e8e
+Source RPM : (none)
+Build Date : Wed 21 Jun 2017 07:37:52 PM PDT Build Host : ubuntu
+Relocations : (not relocatable)
+Packager: Poky <p...@yoctoproject.org>
+URL : http://tiswww.case.edu/php/chet/bash/bashtop.html
+Summary : 8
+Description :
+8
+
+Signed-off-by: zhengrq <zhengrq.f...@cn.fujitsu.com>
+---
+ rpmdb/tagname.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/rpmdb/tagname.c b/rpmdb/tagname.c index cfd1459..dbcafd1
+100644
+--- a/rpmdb/tagname.c
b/rpmdb/tagname.c
+@@ -518,9 +518,9 @@ tagStore_t tagStoreFree(tagStore_t dbiTags, size_t
+dbiNTags) void tagTypeValidate(HE_t he); void tagTypeValidate(HE_t
+he) {
+-/* XXX Re-map RPM_I18NSTRING_TYPE -> RPM_STRING_TYPE */
++/* XXX RPM_I18NSTRING_TYPE is treated as strings. */
+ if (he->t == RPM_I18NSTRING_TYPE)
+- he->t = RPM_STRING_TYPE;
++ return;
+
+ /* XXX Arbitrary tags are always strings. */
+ if ((he->tag & 0x4000)
+--
+2.7.4
+
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.16.bb
b/meta/recipes-devtools/rpm/rpm_5.4.16.bb
index 497af8e..ae5e0c4 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.16.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.16.bb
@@ -120,6 +120,7 @@ SRC_URI += " \
file://0001-system.h-query.c-support-nosignature.patch \
file://rpm-ensure-rpm2cpio-call-rpm-relocation-code.patch \
file://0001-macros-add-_gpg_sign_cmd_extra_args.patch \
+ file://0001-Fix-the-Bug-of-SRPM-String-error.patch \
"
# OE specific changes
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [morty] [PATCH] rpm: Fix the Bug of SRPM String error
Ping Zheng Ruoqin Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) ADDR.: No.6 Wenzhu Road, Software Avenue, Nanjing, 210012, China MAIL : zhengrq.f...@cn.fujistu.com -Original Message- From: Zheng, Ruoqin/郑 若钦 Sent: Monday, May 08, 2017 6:17 PM To: openembedded-core@lists.openembedded.org Cc: Zheng, Ruoqin/郑 若钦 <zhengrq.f...@cn.fujitsu.com> Subject: [OE-core] [morty] [PATCH] rpm: Fix the Bug of SRPM String error Add a patch 0001-Fix-the-Bug-of-SRPM-String-error.patch to fix SRPM bug When use bitbake to build a SRPM package, some sections of SRPM can't be displayed normally. For example: $ rpm -qpi zlib-1.2.8-r0.src.rpm warning: zlib-1.2.8-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID e64962a6: NOKEY Name: zlib Version : 1.2.8 Release : r0 Architecture: i586 Install Date: (not installed) Group : ﺩ Size: 633007 License : Zlib Signature : DSA/SHA1, 2017å¹´04月22æ—¥ 00時38分03秒, Key ID bc5e0520e64962a6 Source RPM : (none) Build Date : 2017å¹´04月22æ—¥ 00時38分03秒 Build Host : force Relocations : (not relocatable) Packager: Poky <p...@yoctoproject.org> URL : http://zlib.net/ Summary : ¨¯ Description : ﺩ Signed-off-by: Zheng Ruoqin <zhengrq.f...@cn.fujitsu.com> --- .../0001-Fix-the-Bug-of-SRPM-String-error.patch| 162 + meta/recipes-devtools/rpm/rpm_5.4.16.bb| 1 + 2 files changed, 163 insertions(+) create mode 100644 meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch diff --git a/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch new file mode 100644 index 000..85c48ac --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-erro +++ r.patch @@ -0,0 +1,162 @@ +Subject: [PATCH] Fix the Bug of SRPM String error + +Upstream-Status: Backport from rpm 5.4.16 $ rpm -qpi +zlib-1.2.8-r0.src.rpm +warning: zlib-1.2.8-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID e64962a6: NOKEY +Name: zlib +Version : 1.2.8 +Release : r0 +Architecture: i586 +Install Date: (not installed) +Group : ﺩ +Size: 633007 +License : Zlib +Signature : DSA/SHA1, 2017å¹´04月22æ—¥ 00時38分03秒, Key ID bc5e0520e64962a6 +Source RPM : (none) +Build Date : 2017å¹´04月22æ—¥ 00時38分03秒 +Build Host : force +Relocations : (not relocatable) +Packager: Poky <p...@yoctoproject.org> +URL : http://zlib.net/ +Summary : ¨¯ +Description : +ﺩ + +Signed-off-by: Zheng Ruoqin <zhengrq.f...@cn.fujitsu.com> +--- + rpmdb/header.c | 8 + rpmdb/rpmtag.h | 1 + + rpmdb/tagname.c | 61 +- + 3 files changed, 48 insertions(+), 22 deletions(-) + +diff --git a/rpmdb/header.c b/rpmdb/header.c index 5d6c6cf..5a80df0 +100644 +--- a/rpmdb/header.c b/rpmdb/header.c +@@ -32,7 +32,7 @@ GENfree(HeaderIterator) + #endif/* __cplusplus */ + + #if defined(SUPPORT_IMPLICIT_TAG_DATA_TYPES) +-extern void tagTypeValidate(HE_t he) ++extern void tagTypeValidate(HE_t he, unsigned int flags) + /*@*/; + #endif + +@@ -2281,7 +2281,7 @@ int headerGet(Header h, HE_t he, unsigned int +flags) /*@-modfilesys@*/ + /* XXX verify that explicit and implicit types are identical. */ + if (rc) +- tagTypeValidate(he); ++tagTypeValidate(he, flags); + /*@=modfilesys@*/ + #endif + +@@ -2304,7 +2304,7 @@ int headerPut(Header h, HE_t he, /*@unused@*/ +unsigned int flags) #if defined(SUPPORT_IMPLICIT_TAG_DATA_TYPES) + /*@-modfilesys@*/ + /* XXX verify that explicit and implicit types are identical. */ +-tagTypeValidate(he); ++tagTypeValidate(he, flags); + /*@=modfilesys@*/ + #endif + +@@ -2329,7 +2329,7 @@ int headerMod(Header h, HE_t he, /*@unused@*/ +unsigned int flags) #if defined(SUPPORT_IMPLICIT_TAG_DATA_TYPES) + /*@-modfilesys@*/ + /* XXX verify that explicit and implicit types are identical. */ +-tagTypeValidate(he); ++tagTypeValidate(he, flags); + /*@=modfilesys@*/ + #endif + +diff --git a/rpmdb/rpmtag.h b/rpmdb/rpmtag.h index ffce678..8f6a2bf +100644 +--- a/rpmdb/rpmtag.h b/rpmdb/rpmtag.h +@@ -868,6 +868,7 @@ int headerGet(Header h, HE_t he, unsigned int flags) + /*@modifies he, internalState @*/; + #define HEADERGET_NOEXTENSION (1 << 0) /*!< Extension search disabler. */ + #define HEADERGET_NOI18NSTRING (1 << 1) /*!< Return i18n strings as argv. */ ++#define HEADERGET_SIGHEADER (1 << 2) /*!< Override signature tag data. */ + + /** \ingroup header + * Add or append tag container to header. +diff --git a/rpmdb/tagname.c b/rpmdb/tagname.c index cfd1459..374ad77 +100644 +--- a/rpmdb/tagname.c b/rpmdb/tagname.c +@@ -515,28 +515,53 @@ tagStore_t tagStoreFree(tagStore_t dbiTags, +size_t dbiNTags) + * Validate th
Re: [OE-core] [krogoth] [PATCH] rpm: Fix the Bug of SRPM String error
Ping Zheng Ruoqin Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) ADDR.: No.6 Wenzhu Road, Software Avenue, Nanjing, 210012, China MAIL : zhengrq.f...@cn.fujistu.com -Original Message- From: Zheng, Ruoqin/郑 若钦 Sent: Monday, May 08, 2017 6:16 PM To: openembedded-core@lists.openembedded.org Cc: Zheng, Ruoqin/郑 若钦 <zhengrq.f...@cn.fujitsu.com> Subject: [OE-core] [krogoth] [PATCH] rpm: Fix the Bug of SRPM String error Add a patch 0001-Fix-the-Bug-of-SRPM-String-error.patch to fix SRPM bug When use bitbake to build a SRPM package, some sections of SRPM can't be displayed normally. For example: $ rpm -qpi zlib-1.2.8-r0.src.rpm warning: zlib-1.2.8-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID e64962a6: NOKEY Name: zlib Version : 1.2.8 Release : r0 Architecture: i586 Install Date: (not installed) Group : ﺩ Size: 633007 License : Zlib Signature : DSA/SHA1, 2017å¹´04月22æ—¥ 00時38分03秒, Key ID bc5e0520e64962a6 Source RPM : (none) Build Date : 2017å¹´04月22æ—¥ 00時38分03秒 Build Host : force Relocations : (not relocatable) Packager: Poky <p...@yoctoproject.org> URL : http://zlib.net/ Summary : ¨¯ Description : ﺩ Signed-off-by: Zheng Ruoqin <zhengrq.f...@cn.fujitsu.com> --- .../0001-Fix-the-Bug-of-SRPM-String-error.patch| 162 + meta/recipes-devtools/rpm/rpm_5.4.16.bb| 1 + 2 files changed, 163 insertions(+) create mode 100644 meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch diff --git a/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch new file mode 100644 index 000..85c48ac --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-erro +++ r.patch @@ -0,0 +1,162 @@ +Subject: [PATCH] Fix the Bug of SRPM String error + +Upstream-Status: Backport from rpm 5.4.16 $ rpm -qpi +zlib-1.2.8-r0.src.rpm +warning: zlib-1.2.8-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID e64962a6: NOKEY +Name: zlib +Version : 1.2.8 +Release : r0 +Architecture: i586 +Install Date: (not installed) +Group : ﺩ +Size: 633007 +License : Zlib +Signature : DSA/SHA1, 2017å¹´04月22æ—¥ 00時38分03秒, Key ID bc5e0520e64962a6 +Source RPM : (none) +Build Date : 2017å¹´04月22æ—¥ 00時38分03秒 +Build Host : force +Relocations : (not relocatable) +Packager: Poky <p...@yoctoproject.org> +URL : http://zlib.net/ +Summary : ¨¯ +Description : +ﺩ + +Signed-off-by: Zheng Ruoqin <zhengrq.f...@cn.fujitsu.com> +--- + rpmdb/header.c | 8 + rpmdb/rpmtag.h | 1 + + rpmdb/tagname.c | 61 +- + 3 files changed, 48 insertions(+), 22 deletions(-) + +diff --git a/rpmdb/header.c b/rpmdb/header.c index 5d6c6cf..5a80df0 +100644 +--- a/rpmdb/header.c b/rpmdb/header.c +@@ -32,7 +32,7 @@ GENfree(HeaderIterator) + #endif/* __cplusplus */ + + #if defined(SUPPORT_IMPLICIT_TAG_DATA_TYPES) +-extern void tagTypeValidate(HE_t he) ++extern void tagTypeValidate(HE_t he, unsigned int flags) + /*@*/; + #endif + +@@ -2281,7 +2281,7 @@ int headerGet(Header h, HE_t he, unsigned int +flags) /*@-modfilesys@*/ + /* XXX verify that explicit and implicit types are identical. */ + if (rc) +- tagTypeValidate(he); ++tagTypeValidate(he, flags); + /*@=modfilesys@*/ + #endif + +@@ -2304,7 +2304,7 @@ int headerPut(Header h, HE_t he, /*@unused@*/ +unsigned int flags) #if defined(SUPPORT_IMPLICIT_TAG_DATA_TYPES) + /*@-modfilesys@*/ + /* XXX verify that explicit and implicit types are identical. */ +-tagTypeValidate(he); ++tagTypeValidate(he, flags); + /*@=modfilesys@*/ + #endif + +@@ -2329,7 +2329,7 @@ int headerMod(Header h, HE_t he, /*@unused@*/ +unsigned int flags) #if defined(SUPPORT_IMPLICIT_TAG_DATA_TYPES) + /*@-modfilesys@*/ + /* XXX verify that explicit and implicit types are identical. */ +-tagTypeValidate(he); ++tagTypeValidate(he, flags); + /*@=modfilesys@*/ + #endif + +diff --git a/rpmdb/rpmtag.h b/rpmdb/rpmtag.h index ffce678..8f6a2bf +100644 +--- a/rpmdb/rpmtag.h b/rpmdb/rpmtag.h +@@ -868,6 +868,7 @@ int headerGet(Header h, HE_t he, unsigned int flags) + /*@modifies he, internalState @*/; + #define HEADERGET_NOEXTENSION (1 << 0) /*!< Extension search disabler. */ + #define HEADERGET_NOI18NSTRING (1 << 1) /*!< Return i18n strings as argv. */ ++#define HEADERGET_SIGHEADER (1 << 2) /*!< Override signature tag data. */ + + /** \ingroup header + * Add or append tag container to header. +diff --git a/rpmdb/tagname.c b/rpmdb/tagname.c index cfd1459..374ad77 +100644 +--- a/rpmdb/tagname.c b/rpmdb/tagname.c +@@ -515,28 +515,53 @@ tagStore_t tagStoreFree(tagStore_t dbiTags, +size_t dbiNTags) +
Re: [OE-core] [jethro] [PATCH] rpm: Fix the Bug of SRPM String error
Ping Zheng Ruoqin Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) ADDR.: No.6 Wenzhu Road, Software Avenue, Nanjing, 210012, China MAIL : zhengrq.f...@cn.fujistu.com -Original Message- From: Zheng, Ruoqin/郑 若钦 Sent: Monday, May 08, 2017 6:16 PM To: openembedded-core@lists.openembedded.org Cc: Zheng, Ruoqin/郑 若钦 <zhengrq.f...@cn.fujitsu.com> Subject: [OE-core] [jethro] [PATCH] rpm: Fix the Bug of SRPM String error Add a patch 0001-Fix-the-Bug-of-SRPM-String-error.patch to fix SRPM bug When use bitbake to build a SRPM package, some sections of SRPM can't be displayed normally. For example: $ rpm -qpi zlib-1.2.8-r0.src.rpm warning: zlib-1.2.8-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID e64962a6: NOKEY Name: zlib Version : 1.2.8 Release : r0 Architecture: i586 Install Date: (not installed) Group : ﺩ Size: 633007 License : Zlib Signature : DSA/SHA1, 2017å¹´04月22æ—¥ 00時38分03秒, Key ID bc5e0520e64962a6 Source RPM : (none) Build Date : 2017å¹´04月22æ—¥ 00時38分03秒 Build Host : force Relocations : (not relocatable) Packager: Poky <p...@yoctoproject.org> URL : http://zlib.net/ Summary : ¨¯ Description : ﺩ Signed-off-by: Zheng Ruoqin <zhengrq.f...@cn.fujitsu.com> --- .../0001-Fix-the-Bug-of-SRPM-String-error.patch| 162 + meta/recipes-devtools/rpm/rpm_5.4.14.bb| 1 + 2 files changed, 163 insertions(+) create mode 100644 meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch diff --git a/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch new file mode 100644 index 000..f85e333 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-erro +++ r.patch @@ -0,0 +1,162 @@ +Subject: [PATCH] Fix the Bug of SRPM String error + +Upstream-Status: Backport from rpm 5.4.16 $ rpm -qpi +zlib-1.2.8-r0.src.rpm +warning: zlib-1.2.8-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID e64962a6: NOKEY +Name: zlib +Version : 1.2.8 +Release : r0 +Architecture: i586 +Install Date: (not installed) +Group : د +Size: 633007 +License : Zlib +Signature : DSA/SHA1, 2017å¹´04月22æ—¥ 00時38分03秒, Key ID bc5e0520e64962a6 +Source RPM : (none) +Build Date : 2017å¹´04月22æ—¥ 00時38分03秒 +Build Host : force +Relocations : (not relocatable) +Packager: Poky <p...@yoctoproject.org> +URL : http://zlib.net/ +Summary : ¨¯ +Description : +د + +Signed-off-by: Zheng Ruoqin <zhengrq.f...@cn.fujitsu.com> +--- + rpmdb/header.c | 8 + rpmdb/rpmtag.h | 1 + + rpmdb/tagname.c | 61 +- + 3 files changed, 48 insertions(+), 22 deletions(-) + +diff --git a/rpmdb/header.c b/rpmdb/header.c index 2f72a05..0e1d613 +100644 +--- a/rpmdb/header.c b/rpmdb/header.c +@@ -32,7 +32,7 @@ GENfree(HeaderIterator) + #endif/* __cplusplus */ + + #if defined(SUPPORT_IMPLICIT_TAG_DATA_TYPES) +-extern void tagTypeValidate(HE_t he) ++extern void tagTypeValidate(HE_t he, unsigned int flags) + /*@*/; + #endif + +@@ -2273,7 +2273,7 @@ int headerGet(Header h, HE_t he, unsigned int +flags) /*@-modfilesys@*/ + /* XXX verify that explicit and implicit types are identical. */ + if (rc) +- tagTypeValidate(he); ++ tagTypeValidate(he, flags); + /*@=modfilesys@*/ + #endif + +@@ -2296,7 +2296,7 @@ int headerPut(Header h, HE_t he, /*@unused@*/ +unsigned int flags) #if defined(SUPPORT_IMPLICIT_TAG_DATA_TYPES) + /*@-modfilesys@*/ + /* XXX verify that explicit and implicit types are identical. */ +-tagTypeValidate(he); ++tagTypeValidate(he, flags); + /*@=modfilesys@*/ + #endif + +@@ -2321,7 +2321,7 @@ int headerMod(Header h, HE_t he, /*@unused@*/ +unsigned int flags) #if defined(SUPPORT_IMPLICIT_TAG_DATA_TYPES) + /*@-modfilesys@*/ + /* XXX verify that explicit and implicit types are identical. */ +-tagTypeValidate(he); ++tagTypeValidate(he, flags); + /*@=modfilesys@*/ + #endif + +diff --git a/rpmdb/rpmtag.h b/rpmdb/rpmtag.h index b4ad445..e5c895d +100644 +--- a/rpmdb/rpmtag.h b/rpmdb/rpmtag.h +@@ -772,6 +772,7 @@ int headerGet(Header h, HE_t he, unsigned int flags) + /*@modifies he, internalState @*/; + #define HEADERGET_NOEXTENSION (1 << 0) /*!< Extension search disabler. */ + #define HEADERGET_NOI18NSTRING (1 << 1) /*!< Return i18n strings as argv. */ ++#define HEADERGET_SIGHEADER (1 << 2) /*!< Override signature tag data. */ + + /** \ingroup header + * Add or append tag container to header. +diff --git a/rpmdb/tagname.c b/rpmdb/tagname.c index c30a3c2..44fda1c +100644 +--- a/rpmdb/tagname.c b/rpmdb/tagname.c +@@ -504,28 +504,53 @@ tagStore_t tagStoreFree(tagStore_t dbiTags, +size_t dbiNTags) +
Re: [OE-core] [meta-freescale]: 32be_rootfs boot from sdcard
32be_rootfs boot from sdcard (ls1046) I used source code provided by nxp QorIQ-Linux-SDK-v2.0-SOURCE.iso + SDK-V2.0-1701 to build the kernel and rootfs , then it can’t boot from sdcard. I tried to put kernel(32be) and rootfs(32be) in SD card , and boot it follow the SDK2.0, it was fail to mount the rootfs(while 64be kernel is normal),and here is part of log: mmcblk0: mmc0:0007 SL32G 29.0 GiB mcblk0: p1 VFS: Mounted root (ext2 filesystem) on device 1:0. VFS: Cannot open root device "mmcblk0p1" or unknown-block(0,0): error -6 Please append a correct "root=" boot option; here are the available partitions: 0100 262144 ram0 (driver?) 0101 262144 ram1 (driver?) 0102 262144 ram2 (driver?) 0103 262144 ram3 (driver?) 0104 262144 ram4 (driver?) 0105 262144 ram5 (driver?) 0106 262144 ram6 (driver?) 0107 262144 ram7 (driver?) 1f00 524288 mtdblock0 (driver?) b30030375936 mmcblk0 driver: mmcblk b30130371936 mmcblk0p1 -01 Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(0,0) CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.1.30-rt34+ #2 Hardware name: Freescale LAYERSCAPE The entire log is in atachments, do anyone have any idea about this problem? By the way, I tried to boot the kernel with command “bootm a000:kernel@1 - a000:fdt@1” And the log show as below, you can see that mmcblk0 device is missed, do anyone know the reason? ALSA device list: No soundcards found. VFS: Cannot open root device "mmcblk0p1" or unknown-block(0,0): error -6 Please append a correct "root=" boot option; here are the available partitions: 0100 262144 ram0 (driver?) 0101 262144 ram1 (driver?) 0102 262144 ram2 (driver?) 0103 262144 ram3 (driver?) 0104 262144 ram4 (driver?) 0105 262144 ram5 (driver?) 0106 262144 ram6 (driver?) 0107 262144 ram7 (driver?) 1f00 524288 mtdblock0 (driver?) Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(0,0) CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.1.30-rt34+ #2 Hardware name: Freescale LAYERSCAPE Zheng Ruoqin Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) ADDR.: No.6 Wenzhu Road, Software Avenue, Nanjing, 210012, China MAIL : zhengrq.f...@cn.fujistu.com<mailto:zhengrq.f...@cn.fujistu.com> -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [meta-freescale]: 32be_rootfs boot from sdcard
32be_rootfs boot from sdcard (ls1046) I tried to put kernel and rootfs in SD card , and boot it follow the SDK note(ls1046), it was fail to mount the rootfs(while 64be kernel is good),and here is part of log: mmcblk0: mmc0:0007 SL32G 29.0 GiB mcblk0: p1 VFS: Mounted root (ext2 filesystem) on device 1:0. VFS: Cannot open root device "mmcblk0p1" or unknown-block(0,0): error -6 Please append a correct "root=" boot option; here are the available partitions: 0100 262144 ram0 (driver?) 0101 262144 ram1 (driver?) 0102 262144 ram2 (driver?) 0103 262144 ram3 (driver?) 0104 262144 ram4 (driver?) 0105 262144 ram5 (driver?) 0106 262144 ram6 (driver?) 0107 262144 ram7 (driver?) 1f00 524288 mtdblock0 (driver?) b30030375936 mmcblk0 driver: mmcblk b30130371936 mmcblk0p1 -01 Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(0,0) CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.1.30-rt34+ #2 Hardware name: Freescale LAYERSCAPE The entire log is in atachments, do anyone have any idea about this problem? By the way, I tried to boot the kernel with command “bootm a000:kernel@1 - a000:fdt@1” And the log show as below, you can see that mmcblk0 device is missed, do anyone know the reason? ALSA device list: No soundcards found. VFS: Cannot open root device "mmcblk0p1" or unknown-block(0,0): error -6 Please append a correct "root=" boot option; here are the available partitions: 0100 262144 ram0 (driver?) 0101 262144 ram1 (driver?) 0102 262144 ram2 (driver?) 0103 262144 ram3 (driver?) 0104 262144 ram4 (driver?) 0105 262144 ram5 (driver?) 0106 262144 ram6 (driver?) 0107 262144 ram7 (driver?) 1f00 524288 mtdblock0 (driver?) Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(0,0) CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.1.30-rt34+ #2 Hardware name: Freescale LAYERSCAPE Zheng Ruoqin Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) ADDR.: No.6 Wenzhu Road, Software Avenue, Nanjing, 210012, China MAIL : zhengrq.f...@cn.fujistu.com => setenv bootcmd "ext2load mmc 0 a000 kernel.itb && bootm a000" => setenv bootargs "root=/dev/mmcblk0p1 rw earlycon=uart8250,0x21c0500 console=ttyS0,115200" => boot 67991979 bytes read in 5829 ms (11.1 MiB/s) ## Loading kernel from FIT Image at a000 ... Using 'config@1' configuration Trying 'kernel@1' kernel subimage Description: ARM32 Linux kernel Type: Kernel Image Compression: uncompressed Data Start: 0xa0e0 Data Size:4468048 Bytes = 4.3 MiB Architecture: ARM OS: Linux Load Address: 0x80008000 Entry Point: 0x80008000 Verifying Hash Integrity ... OK ## Loading ramdisk from FIT Image at a000 ... Using 'config@1' configuration Trying 'ramdisk@1' ramdisk subimage Description: LS1046 Ramdisk Type: RAMDisk Image Compression: uncompressed Data Start: 0xa0448e1c Data Size:63498311 Bytes = 60.6 MiB Architecture: ARM OS: Linux Load Address: unavailable Entry Point: unavailable Verifying Hash Integrity ... OK ## Loading fdt from FIT Image at a000 ... Using 'config@1' configuration Trying 'fdt@1' fdt subimage Description: Flattened Device Tree blob Type: Flat Device Tree Compression: uncompressed Data Start: 0xa0442ee0 Data Size:24245 Bytes = 23.7 KiB Architecture: ARM Verifying Hash Integrity ... OK Loading fdt from 0xa0442ee0 to 0x9000 Booting using the fdt blob at 0x9000 Loading Kernel Image ... OK Using Device Tree in place at 9000, end 90018eb4 Starting kernel ... Booting Linux on physical CPU 0x0 Initializing cgroup subsys cpu Linux version 4.1.30-rt34+ (zhengrq@okura) (gcc version 5.2.0 (GCC) ) #2 SMP Fri Mar 31 11:04:46 JST 2017 CPU: ARMv7 Processor [410fd082] revision 2 (ARMv7), cr=32c5383d CPU: PIPT / VIPT nonaliasing data cache, PIPT instruction cache Machine model: LS1046A RDB Board earlycon: Early serial console at MMIO 0x21c0500 (options '') earlycon: earlycon_map: Couldn't map 0x21c0500 Malformed early option 'earlycon' Reserved memory: initialized node bman-fbpr, compatible id fsl,bman-fbpr Reserved memory: initialized node qman-fqd, compatible id fsl,qman-fqd Reserved memory: initialized node qman-pfdr, compatible id fsl,qman-pfdr cma: Reserved 16 MiB at 0x0009fb00 Forcing write-allocate cache policy for SMP Memory policy: Data cache writealloc PERCPU: Embedded 12 pages/cpu @dc7a s18688 r8192 d22272 u49152 Built 1 zonelists in Zone order, mobility grouping on. Total pages: 2093072 Kernel command l
Re: [OE-core] [jethro][PATCH] gcc-multilib-config: make aarch64 support multilib
I installed the SDK and use it to compile source code.
. /opt/poky/2.0.3/environment-setup-armv7a-vfp-neon-pokymllib32-linux-gnueabi
$CC -o check_endian_arm32 check_endian.c
. /opt/poky/2.0.3/environment-setup-aarch64-poky-linux
$CC -o check_endian_arm64 check_endian.c
From: Khem Raj [mailto:raj.k...@gmail.com]
Sent: Thursday, March 16, 2017 10:06 AM
To: openembedded-core@lists.openembedded.org; Zheng, Ruoqin/郑 若钦
<zhengrq.f...@cn.fujitsu.com>
Subject: Re: [OE-core] [jethro][PATCH] gcc-multilib-config: make aarch64
support multilib
On Wed, Mar 15, 2017 at 2:36 AM zhengrq
<zhengrq.f...@cn.fujitsu.com<mailto:zhengrq.f...@cn.fujitsu.com>> wrote:
Fixed:
MACHINE = qemuarm64
require conf/multilib.conf
MULTILIBS = "multilib:lib32"
DEFAULTTUNE_virtclass-multilib-lib32 = "armv7at-neon"
$ bitbake core-image-minimal -cpopulate_sdk
WARNING: gcc multilib setup is not supported for TARGET_ARCH=aarch64
WARNING: gcc multilib setup is not supported for TARGET_ARCH=aarch64
[YOCTO #8638]
Gcc backend for aarch64 is separate from arm targets how have you tested the
generated compiler sdk
(From OE-Core rev: 0ae52c8b2c1d7d7cdbcfeeae6ff42e64f16bc41d)
Signed-off-by: Robert Yang
<liezhi.y...@windriver.com<mailto:liezhi.y...@windriver.com>>
Signed-off-by: Ross Burton <ross.bur...@intel.com<mailto:ross.bur...@intel.com>>
Signed-off-by: Richard Purdie
<richard.pur...@linuxfoundation.org<mailto:richard.pur...@linuxfoundation.org>>
Signed-off-by: Zheng Ruoqin
<zhengrq.f...@cn.fujitsu.com<mailto:zhengrq.f...@cn.fujitsu.com>>
---
meta/recipes-devtools/gcc/gcc-multilib-config.inc | 7 +++
1 file changed, 7 insertions(+)
diff --git a/meta/recipes-devtools/gcc/gcc-multilib-config.inc
b/meta/recipes-devtools/gcc/gcc-multilib-config.inc
index 1c0a45a..a0a2ac0 100644
--- a/meta/recipes-devtools/gcc/gcc-multilib-config.inc
+++ b/meta/recipes-devtools/gcc/gcc-multilib-config.inc
@@ -29,6 +29,9 @@ python gcc_multilib_setup() {
bb.utils.remove(build_conf_dir, True)
ml_globs = ('%s/*/t-linux64' % src_conf_dir,
'%s/*/linux64.h' % src_conf_dir,
+'%s/aarch64/t-aarch64' % src_conf_dir,
+'%s/aarch64/aarch64.h' % src_conf_dir,
+'%s/aarch64/aarch64-cores.def' % src_conf_dir,
'%s/*/linux.h' % src_conf_dir,
'%s/linux.h' % src_conf_dir)
@@ -130,6 +133,8 @@ python gcc_multilib_setup() {
'mips64': ['gcc/config/mips/t-linux64'],
'powerpc' : ['gcc/config/rs6000/t-linux64'],
'powerpc64' : ['gcc/config/rs6000/t-linux64'],
+'aarch64' : ['gcc/config/aarch64/t-aarch64'],
+'arm' : ['gcc/config/aarch64/t-aarch64'],
}
gcc_header_config_files = {
@@ -140,6 +145,8 @@ python gcc_multilib_setup() {
'mips64': ['gcc/config/mips/linux.h', 'gcc/config/mips/linux64.h'],
'powerpc' : ['gcc/config/rs6000/linux64.h'],
'powerpc64' : ['gcc/config/rs6000/linux64.h'],
+'aarch64' : ['gcc/config/aarch64/aarch64.h'],
+'arm' : ['gcc/config/aarch64/aarch64.h'],
}
libdir32 = 'SYSTEMLIBS_DIR'
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org<mailto:Openembedded-core@lists.openembedded.org>
http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [jethro][PATCH] sdk: arm toolchain patch for multilib
Hi richard
I have sent a new patch to fix toolchain for arm multilib
#8642
(From OE-Core rev: b6253350fb86d8e54792905342a5892af570d526)
Last patch is indeed not in master.
Zheng Ruoqin
-Original Message-
From: Richard Purdie [mailto:richard.pur...@linuxfoundation.org]
Sent: Tuesday, March 14, 2017 3:32 PM
To: Zheng, Ruoqin/郑 若钦 <zhengrq.f...@cn.fujitsu.com>;
openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [jethro][PATCH] sdk: arm toolchain patch for multilib
On Wed, 2017-03-15 at 00:00 +0800, zhengrq wrote:
> The arm toolchain has a "-gnueabi" suffix, but aarch64 doesn't,this
> makes multilib sdk doesn't work, for example:
>
> MACHINE = qemuarm64
> require conf/multilib.conf
> MULTILIBS = "multilib:lib32"
> DEFAULTTUNE_virtclass-multilib-lib32 = "armv7at-neon"
>
> $ bitbake core-image-minimal -cpopulate_sdk
>
> Then extract SDK, the environment-setup-armv7a-vfp-neon-
> pokymllib32-linux-gnueabi doesn't work since:
> * The CC is arm-pokymllib32-linux-gnueabi-gcc which doesn't exist,
> the patch for cross-canadian.bbclass fixes problem.
> * Need aarch64-poky-linux/usr/lib/arm-poky-linux-linux-gnueabi
> which doesn't exist, the patch for libgcc-common.inc fixes the
> problem.
>
> [YOCTO #8616]
>
> Signed-off-by: Robert Yang <liezhi.y...@windriver.com>
> Signed-off-by: Lei Maohui <leimao...@cn.fujitsu.com>
> Signed-off-by: Zheng Ruoqin <zhengrq.f...@cn.fujitsu.com>
I'm not seeing any patch in master which sets GNUEABI_SUFFIX unless I'm missing
something?
Which patch are you backporting to jethro here?
Don't you really want http://git.yoctoproject.org/cgit.cgi/poky/commit/
?id=b6253350fb86d8e54792905342a5892af570d526 ?
and perhaps you mean #8642 or #10054?
Cheers,
Richard
> meta/classes/cross-canadian.bbclass | 3 +++
> meta/recipes-devtools/gcc/libgcc-common.inc | 25 ++-
> --
> meta/recipes-devtools/gcc/libgcc.inc| 2 +-
> 3 files changed, 22 insertions(+), 8 deletions(-)
>
> diff --git a/meta/classes/cross-canadian.bbclass
> b/meta/classes/cross-canadian.bbclass
> index ea17f09..458185d 100644
> --- a/meta/classes/cross-canadian.bbclass
> +++ b/meta/classes/cross-canadian.bbclass
> @@ -18,6 +18,7 @@ PACKAGE_ARCH = "${SDK_ARCH}-${SDKPKGSUFFIX}"
> CANADIANEXTRAOS = "linux-uclibc linux-musl"
> CANADIANEXTRAVENDOR = ""
> MODIFYTOS ??= "1"
> +GNUEABI_SUFFIX = ""
> python () {
> archs = d.getVar('PACKAGE_ARCHS', True).split()
> sdkarchs = []
> @@ -69,6 +70,7 @@ python () {
> d.appendVar("CANADIANEXTRAOS", " linux-gnun32 linux-
> uclibcn32 linux-musln32")
> if tarch == "arm" or tarch == "armeb":
> d.setVar("TARGET_OS", "linux-gnueabi")
> +d.setVar("GNUEABI_SUFFIX", "-gnueabi")
> else:
> d.setVar("TARGET_OS", "linux")
>
> @@ -167,6 +169,7 @@ SHLIBSWORKDIR = "${PKGDATA_DIR}/nativesdk-
> shlibs2"
> cross_canadian_bindirlinks () {
> for i in linux ${CANADIANEXTRAOS}
> do
> +i="$i${GNUEABI_SUFFIX}"
> for v in ${CANADIANEXTRAVENDOR}
> do
> d=${D}${bindir}/../${TARGET_ARCH}$v-$i
> diff --git a/meta/recipes-devtools/gcc/libgcc-common.inc
> b/meta/recipes-devtools/gcc/libgcc-common.inc
> index b09ea65..46f8cfd 100644
> --- a/meta/recipes-devtools/gcc/libgcc-common.inc
> +++ b/meta/recipes-devtools/gcc/libgcc-common.inc
> @@ -134,11 +134,22 @@ BASETARGET_SYS =
> "${TARGET_ARCH}${ORIG_TARGET_VENDOROS}"
>
> addtask extra_symlinks after do_multilib_install before do_package
> do_populate_sysroot
> fakeroot python do_extra_symlinks() {
> -targetsys = d.getVar('BASETARGET_SYS', True)
> -
> -if targetsys != d.getVar('TARGET_SYS', True):
> -dest = d.getVar('D', True) + d.getVar('libdir', True) + '/'
> + targetsys
> -src = d.getVar('TARGET_SYS', True)
> -if not os.path.lexists(dest) and
> os.path.lexists(d.getVar('D', True) + d.getVar('libdir', True)):
> -os.symlink(src, dest)
> +base_targetsys = d.getVar('BASETARGET_SYS', True)
> +targetsys = d.getVar('TARGET_SYS', True)
> +
> +if base_targetsys != targetsys:
> +dest = d.getVar('D', True) + d.getVar('libdir', True) + '/'
> + base_targetsys
> +dest_list = [dest]
> +# For multilib like aarch64 + arm, need 2 symlinks:
> +# 1) BASETARGET_SYS as usual
> +# 2) BASETARGET_SYS + "-gnueabi" for multilib
> +libce = d.getVa
[OE-core] [PATCH] pkgconfig: Fix QA issue when upgrade rpm from 5.4.16 to 5.4.17
pkgconfig : Fix QA issue
When upgrade rpm from 5.4.16 to 5.4.17, a QA WARNING will show as below:
WARNING: rpm-5.4.17-r0 do_package_qa: QA Issue: /usr/lib/pkgconfig/rpm.pc
contained in package rpm-dev requires pkgconfig, but no providers found in
RDEPENDS_rpm-dev? [file-rdeps]
Signed-off-by: Zheng Ruoqin <zhengrq.f...@cn.fujitsu.com>
---
meta/recipes-devtools/pkgconfig/pkgconfig_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
index 422c5f3..2296e76 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
@@ -41,7 +41,7 @@ FILES_${PN} += "${datadir}/aclocal/pkg.m4"
# When using the RPM generated automatic package dependencies, some packages
# will end up requiring 'pkgconfig(pkg-config)'. Allow this behavior by
# specifying an appropriate provide.
-RPROVIDES_${PN} += "pkgconfig(pkg-config)"
+RPROVIDES_${PN} += "pkgconfig(pkg-config) pkgconfig"
# Install a pkg-config-native wrapper that will use the native sysroot instead
# of the MACHINE sysroot, for using pkg-config when building native tools.
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] bash: 4.3.30 -> 4.4
ping
-Original Message-
From: Zheng, Ruoqin/郑 若钦
Sent: Monday, January 23, 2017 10:39 AM
To: openembedded-core@lists.openembedded.org
Cc: Zheng, Ruoqin/郑 若钦 <zhengrq.f...@cn.fujitsu.com>
Subject: [OE-core] [PATCH V2] bash: 4.3.30 -> 4.4
1) Upgrade bash from 4.3.30 to 4.4
2) Delete 1 patche below, since they are integrated upstream.
fix-run-intl.patch
3) Modify 2 patches below to make it compatible with new version
fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch
test-output.patch
4) Add 1 patche below to solve pkgconfig sanity error
0001-patch-to-obtain-pkgconfig-sanity.patch
Signed-off-by: Zheng Ruoqin <zhengrq.f...@cn.fujitsu.com>
---
.../0001-patch-to-obtain-pkgconfig-sanity.patch| 28 +
...roc-run-heredoc-run-execscript-run-test-f.patch | 137 ++---
meta/recipes-extended/bash/bash/fix-run-intl.patch | 110 -
meta/recipes-extended/bash/bash/test-output.patch | 20 ++-
meta/recipes-extended/bash/bash_4.3.30.bb | 71 ---
meta/recipes-extended/bash/bash_4.4.bb | 38 ++
6 files changed, 92 insertions(+), 312 deletions(-) create mode 100644
meta/recipes-extended/bash/bash/0001-patch-to-obtain-pkgconfig-sanity.patch
delete mode 100644 meta/recipes-extended/bash/bash/fix-run-intl.patch
delete mode 100644 meta/recipes-extended/bash/bash_4.3.30.bb
create mode 100644 meta/recipes-extended/bash/bash_4.4.bb
diff --git
a/meta/recipes-extended/bash/bash/0001-patch-to-obtain-pkgconfig-sanity.patch
b/meta/recipes-extended/bash/bash/0001-patch-to-obtain-pkgconfig-sanity.patch
new file mode 100644
index 000..9b5e4ec
--- /dev/null
+++ b/meta/recipes-extended/bash/bash/0001-patch-to-obtain-pkgconfig-san
+++ ity.patch
@@ -0,0 +1,28 @@
+Subject: [PATCH] patch to obtain pkgconfig sanity
+
+Drop the paths from the pkgconfig file bash.pc.in which will cause pkgconfig
sanity error below:
+ERROR: QA Issue: bash.pc failed sanity test (tmpdir) in path
/yocto/work001/fnst/zrq/community/poky/build/tmp/work/i586-poky-linux/bash
/4.4-r0/sysroot-destdir/usr/lib/pkgconfig [pkgconfig]
+
+Upstream-Status: Pending
+
+Signed-off-by: Zheng Ruoqin <zhengrq.f...@cn.fujitsu.com>
+---
+ support/bash.pc.in | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/support/bash.pc.in b/support/bash.pc.in index
+6009659..871fa9f 100644
+--- a/support/bash.pc.in
b/support/bash.pc.in
+@@ -12,8 +12,6 @@ LOCAL_CFLAGS = @LOCAL_CFLAGS@ LOCAL_DEFS =
+@LOCAL_DEFS@ CCFLAGS = ${LOCAL_DEFS} ${LOCAL_CFLAGS}
+
+-CC = @CC@
+-SHOBJ_CC = @SHOBJ_CC@
+ SHOBJ_CFLAGS = @SHOBJ_CFLAGS@
+ SHOBJ_LD = @SHOBJ_LD@
+ SHOBJ_LDFLAGS = @SHOBJ_LDFLAGS@
+--
+2.7.4
+
diff --git
a/meta/recipes-extended/bash/bash/fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch
b/meta/recipes-extended/bash/bash/fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch
index 7f099ae..d6beaff 100644
---
a/meta/recipes-extended/bash/bash/fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch
+++ b/meta/recipes-extended/bash/bash/fix-run-coproc-run-heredoc-run-exe
+++ cscript-run-test-f.patch
@@ -20,150 +20,35 @@ the test suite should not be run as root
Upstream-Status: Pending
Signed-off-by: Hongxu Jia <hongxu@windriver.com>
+Signed-off-by: Zheng Ruoqin <zhengrq.f...@cn.fujitsu.com>
---
- tests/coproc.right | 5 +
- tests/coproc.tests | 30 +-
- tests/heredoc.right | 5 ++---
- tests/heredoc3.sub | 3 ++-
- tests/run-execscript | 3 ++-
- tests/run-test | 3 ++-
- 6 files changed, 34 insertions(+), 15 deletions(-)
+ tests/run-execscript | 3 ++-
+ tests/run-test | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
-diff --git a/tests/coproc.right b/tests/coproc.right -index 6d9deaa..94b001c
100644
a/tests/coproc.right
-+++ b/tests/coproc.right
-@@ -1,11 +1,8 @@
--84575
- 63 60
- a b c
--84577
- 63 60
- flop
--./coproc.tests: line 22: 84577 Terminated coproc REFLECT { cat
-; }
--84579
-+coproc.tests: REFLECT: status 143
- 63 60
- FOO
- 63 60
-diff --git a/tests/coproc.tests b/tests/coproc.tests -index 8be3563..d347eb7
100644
a/tests/coproc.tests
-+++ b/tests/coproc.tests
-@@ -1,6 +1,13 @@
-+: ${TMPDIR:=/tmp}
-+TMPOUT=${TMPDIR}/coproc-wait-$BASHPID
-+
- coproc { echo a b c; sleep 2; }
-
--echo $COPROC_PID
-+case $COPROC_PID in
-+[0-9]*) ;;
-+*)echo COPROC_PID not integer ;;
-+esac
-+
- echo ${COPROC[@]}
-
- read LINE <&${COPROC[0]}
-@@ -10,7 +17,11 @@ wait $COPROC_PID
-
- coproc REFLECT { cat - ; }
-
--echo $REFLECT_PID
-+case $REFLECT_PID in
-+[0-9]*) ;;
-+*)echo REFLECT_PID not integer ;;
-+esac
-+
- echo ${REFLECT[@]}
-
- echo flop >&${REFLECT[1]}
-@@ -18,12 +29,21 @@ read LINE <&${REFLECT[0]}
-
- echo $LINE
-
--kill $REFLECT_PID
--wait $REFLECT_PID
-+{ sleep 1; kill $REFLECT_PID; } &
-+wait $REFLECT_PID >$TMPOUT 2>&1 || echo "coproc.tests: REFLECT:
Re: [OE-core] [PATCH] elfutils: 0.166->0.168
ping From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Zheng, Ruoqin Sent: Wednesday, January 25, 2017 9:52 AM To: Jussi Kukkonen <jussi.kukko...@intel.com> Cc: Patches and discussions about the oe-core layer <openembedded-core@lists.openembedded.org> Subject: Re: [OE-core] [PATCH] elfutils: 0.166->0.168 Hi Jussi I really used git rename to produce 0.166 to 0.168 patch, but it did not work on last patch 0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch. I guess it’s because I used a different way from the original author. I used git format-patch, maybe he used patch -Naur? The original patch fixed 73 files, and the index of each file is: Index: elfutils-0.166/libelf/elf_getarsym.c === --- elfutils-0.166.orig/libelf/elf_getarsym.c +++ elfutils-0.166/libelf/elf_getarsym.c And my new patch here is like diff --git a/libelf/elf_getarsym.c b/libelf/elf_getarsym.c index 42ed0d1..6e7a3d5 100644 --- a/libelf/elf_getarsym.c +++ b/libelf/elf_getarsym.c @@ -303,7 +303,7 @@ elf_getarsym (Elf *elf, size_t *ptr) arsym[cnt].as_hash = _dl_elf_hash (str_data); I also found that the order of fixed files is different from original patch. So git check these changes and consider the difference is big enough to produce a new file? Zheng From: Jussi Kukkonen [mailto:jussi.kukko...@intel.com] Sent: Tuesday, January 24, 2017 4:50 PM To: Zheng, Ruoqin/郑 若钦 <zhengrq.f...@cn.fujitsu.com<mailto:zhengrq.f...@cn.fujitsu.com>> Cc: Patches and discussions about the oe-core layer <openembedded-core@lists.openembedded.org<mailto:openembedded-core@lists.openembedded.org>> Subject: Re: [OE-core] [PATCH] elfutils: 0.166->0.168 On 24 January 2017 at 09:13, Zheng Ruoqin <zhengrq.f...@cn.fujitsu.com<mailto:zhengrq.f...@cn.fujitsu.com>> wrote: 1) Upgrade elfutils from 0.166 to 0.168 2) Delete 1 patch below to make it compatible with new version elfcmp-fix-self-comparision.patch 3) Modify 4 patches below to make it compatible with new version elfutils-0.166/hppa_backend.diff -> elfutils-0.168/hppa_backend.diff elfutils-0.166/mips_backend.diff -> elfutils-0.168/mips_backend.diff elfutils-0.166/m68k_backend.diff -> elfutils-0.168/m68k_backend.diff elfutils-0.166/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch -> elfutils-0.168/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch The last one is now showing as one removed and one added patch. Please use git rename detection to make it more readable: $ git config diff.renames copies Thanks, Jussi -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] busybox: 1.24.1 -> 1.26.2
ping
-Original Message-
From: Zheng, Ruoqin/郑 若钦
Sent: Monday, January 23, 2017 10:41 AM
To: openembedded-core@lists.openembedded.org
Cc: Zheng, Ruoqin/郑 若钦 <zhengrq.f...@cn.fujitsu.com>
Subject: [OE-core] [PATCH] busybox: 1.24.1 -> 1.26.2
1) Upgrade busybox from 1.24.1 to 1.26.2
2) Delete 12 patches below, since they are integrated upstream.
busybox/0001-flock-update-the-behaviour-of-c-parameter-to-match-u.patch
busybox/0001-libiproute-handle-table-ids-larger-than-255.patch
busybox/0001-sed-fix-sed-n-flushes-pattern-space-terminates-early.patch
busybox/CVE-2016-2147.patch
busybox/CVE-2016-2147_2.patch
busybox/CVE-2016-2148.patch
busybox/busybox-1.24.1-truncate-open-mode.patch
busybox/busybox-1.24.1-unzip-regression.patch
busybox/busybox-1.24.1-unzip.patch
busybox/busybox-kbuild-race-fix-commit-d8e61bb.patch
busybox/commit-applet_tables-fix-commit-0dddbc1.patch
busybox/ip_fix_problem_on_mips64_n64_big_endian_musl_systems.patch
3) Modify 3 patches below to make it compatible with new version
busybox/busybox-cross-menuconfig.patch
busybox/busybox-udhcpc-no_deconfig.patch
busybox/makefile-fix-backport.patch
Signed-off-by: Zheng Ruoqin <zhengrq.f...@cn.fujitsu.com>
---
...e-the-behaviour-of-c-parameter-to-match-u.patch | 73 ---
...biproute-handle-table-ids-larger-than-255.patch | 134 ---
...-n-flushes-pattern-space-terminates-early.patch | 72 ---
.../busybox/busybox/CVE-2016-2147.patch| 57
.../busybox/busybox/CVE-2016-2147_2.patch | 32 -
.../busybox/busybox/CVE-2016-2148.patch| 74 ---
.../busybox-1.24.1-truncate-open-mode.patch| 81
.../busybox/busybox-1.24.1-unzip-regression.patch | 143 -
.../busybox/busybox/busybox-1.24.1-unzip.patch | 118 -
.../busybox/busybox/busybox-cross-menuconfig.patch | 70 +-
.../busybox-kbuild-race-fix-commit-d8e61bb.patch | 53
.../busybox/busybox-udhcpc-no_deconfig.patch | 70 +-
.../commit-applet_tables-fix-commit-0dddbc1.patch | 61 -
...lem_on_mips64_n64_big_endian_musl_systems.patch | 90 -
.../busybox/busybox/makefile-fix-backport.patch| 30 ++---
.../{busybox_1.24.1.bb => busybox_1.26.2.bb} | 16 +--
16 files changed, 88 insertions(+), 1086 deletions(-)
delete mode 100644
meta/recipes-core/busybox/busybox/0001-flock-update-the-behaviour-of-c-parameter-to-match-u.patch
delete mode 100644
meta/recipes-core/busybox/busybox/0001-libiproute-handle-table-ids-larger-than-255.patch
delete mode 100644
meta/recipes-core/busybox/busybox/0001-sed-fix-sed-n-flushes-pattern-space-terminates-early.patch
delete mode 100644 meta/recipes-core/busybox/busybox/CVE-2016-2147.patch
delete mode 100644 meta/recipes-core/busybox/busybox/CVE-2016-2147_2.patch
delete mode 100644 meta/recipes-core/busybox/busybox/CVE-2016-2148.patch
delete mode 100644
meta/recipes-core/busybox/busybox/busybox-1.24.1-truncate-open-mode.patch
delete mode 100644
meta/recipes-core/busybox/busybox/busybox-1.24.1-unzip-regression.patch
delete mode 100644 meta/recipes-core/busybox/busybox/busybox-1.24.1-unzip.patch
delete mode 100644
meta/recipes-core/busybox/busybox/busybox-kbuild-race-fix-commit-d8e61bb.patch
delete mode 100644
meta/recipes-core/busybox/busybox/commit-applet_tables-fix-commit-0dddbc1.patch
delete mode 100644
meta/recipes-core/busybox/busybox/ip_fix_problem_on_mips64_n64_big_endian_musl_systems.patch
rename meta/recipes-core/busybox/{busybox_1.24.1.bb => busybox_1.26.2.bb} (66%)
diff --git
a/meta/recipes-core/busybox/busybox/0001-flock-update-the-behaviour-of-c-parameter-to-match-u.patch
b/meta/recipes-core/busybox/busybox/0001-flock-update-the-behaviour-of-c-parameter-to-match-u.patch
deleted file mode 100644
index 8bcbd73..000
---
a/meta/recipes-core/busybox/busybox/0001-flock-update-the-behaviour-of-c-parameter-to-match-u.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 198f18addf1d814c2fefcb492f3b9fbd221669bb Mon Sep 17 00:00:00 2001
-From: "Maxin B. John" <maxin.j...@intel.com>
-Date: Wed, 20 Apr 2016 18:24:45 +0300
-Subject: [PATCH] flock: update the behaviour of -c parameter to match upstream
-
-In upstream, -c 'PROG ARGS' means "run sh -c 'PROG ARGS'"
-
-function old new delta
-flock_main 286 377 +91
-.rodata 155849 155890 +41
-
-Upstream-Status: Submitted
-[ http://lists.busybox.net/pipermail/busybox/2016-April/084142.html ]
-
-Signed-off-by: Maxin B. John <maxin.j...@intel.com>
- util-linux/flock.c | 20 ++--
- 1 file changed, 14 insertions(+), 6 deletions(-)
-
-diff --git a/util-linux/flock.c b/util-linux/flock.c
-index 05a747f..c85a25d 100644
a/u
Re: [OE-core] [PATCH] elfutils: 0.166->0.168
Hi Jussi I really used git rename to produce 0.166 to 0.168 patch, but it did not work on last patch 0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch. I guess it’s because I used a different way from the original author. I used git format-patch, maybe he used patch -Naur? The original patch fixed 73 files, and the index of each file is: Index: elfutils-0.166/libelf/elf_getarsym.c === --- elfutils-0.166.orig/libelf/elf_getarsym.c +++ elfutils-0.166/libelf/elf_getarsym.c And my new patch here is like diff --git a/libelf/elf_getarsym.c b/libelf/elf_getarsym.c index 42ed0d1..6e7a3d5 100644 --- a/libelf/elf_getarsym.c +++ b/libelf/elf_getarsym.c @@ -303,7 +303,7 @@ elf_getarsym (Elf *elf, size_t *ptr) arsym[cnt].as_hash = _dl_elf_hash (str_data); I also found that the order of fixed files is different from original patch. So git check these changes and consider the difference is big enough to produce a new file? Zheng From: Jussi Kukkonen [mailto:jussi.kukko...@intel.com] Sent: Tuesday, January 24, 2017 4:50 PM To: Zheng, Ruoqin/郑 若钦 <zhengrq.f...@cn.fujitsu.com> Cc: Patches and discussions about the oe-core layer <openembedded-core@lists.openembedded.org> Subject: Re: [OE-core] [PATCH] elfutils: 0.166->0.168 On 24 January 2017 at 09:13, Zheng Ruoqin <zhengrq.f...@cn.fujitsu.com<mailto:zhengrq.f...@cn.fujitsu.com>> wrote: 1) Upgrade elfutils from 0.166 to 0.168 2) Delete 1 patch below to make it compatible with new version elfcmp-fix-self-comparision.patch 3) Modify 4 patches below to make it compatible with new version elfutils-0.166/hppa_backend.diff -> elfutils-0.168/hppa_backend.diff elfutils-0.166/mips_backend.diff -> elfutils-0.168/mips_backend.diff elfutils-0.166/m68k_backend.diff -> elfutils-0.168/m68k_backend.diff elfutils-0.166/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch -> elfutils-0.168/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch The last one is now showing as one removed and one added patch. Please use git rename detection to make it more readable: $ git config diff.renames copies Thanks, Jussi -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] elfutils: 0.166->0.168
1) Upgrade elfutils from 0.166 to 0.168
2) Delete 1 patch below to make it compatible with new version
elfcmp-fix-self-comparision.patch
3) Modify 4 patches below to make it compatible with new version
elfutils-0.166/hppa_backend.diff -> elfutils-0.168/hppa_backend.diff
elfutils-0.166/mips_backend.diff -> elfutils-0.168/mips_backend.diff
elfutils-0.166/m68k_backend.diff -> elfutils-0.168/m68k_backend.diff
elfutils-0.166/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch
->
elfutils-0.168/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch
4) Update the homepage and SRC_URI on recipe
Signed-off-by: Zheng Ruoqin <zhengrq.f...@cn.fujitsu.com>
---
...de-alternatives-for-glibc-assumptions-hel.patch | 1163
.../elfcmp-fix-self-comparision.patch | 41 -
.../elfutils/elfutils-0.166/m68k_backend.diff | 492 -
...ferences-between-mips-machine-identifiers.patch |0
...de-alternatives-for-glibc-assumptions-hel.patch | 1093 ++
...m-Silence-Werror-maybe-uninitialized-fals.patch |0
.../0001-fix-a-stack-usage-warning.patch |0
.../0001-remove-the-unneed-checking.patch |0
...-support-for-mips64-abis-in-mips_retval.c.patch |0
.../0003-Add-mips-n64-relocation-format-hack.patch |0
.../aarch64_uio.patch |0
.../arm_backend.diff |0
.../fixheadercheck.patch |0
.../hppa_backend.diff | 173 +--
.../kfreebsd_path.patch|0
.../elfutils/elfutils-0.168/m68k_backend.diff | 27 +
.../mips_backend.diff | 168 +--
.../mips_readelf_w.patch |0
.../shadow.patch |0
.../testsuite-ignore-elflint.diff |0
.../uclibc-support.patch |0
.../{elfutils_0.166.bb => elfutils_0.168.bb} |9 +-
22 files changed, 1322 insertions(+), 1844 deletions(-)
delete mode 100644
meta/recipes-devtools/elfutils/elfutils-0.166/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch
delete mode 100644
meta/recipes-devtools/elfutils/elfutils-0.166/elfcmp-fix-self-comparision.patch
delete mode 100644
meta/recipes-devtools/elfutils/elfutils-0.166/m68k_backend.diff
rename meta/recipes-devtools/elfutils/{elfutils-0.166 =>
elfutils-0.168}/0001-Ignore-differences-between-mips-machine-identifiers.patch
(100%)
create mode 100644
meta/recipes-devtools/elfutils/elfutils-0.168/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch
rename meta/recipes-devtools/elfutils/{elfutils-0.166 =>
elfutils-0.168}/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch
(100%)
rename meta/recipes-devtools/elfutils/{elfutils-0.166 =>
elfutils-0.168}/0001-fix-a-stack-usage-warning.patch (100%)
rename meta/recipes-devtools/elfutils/{elfutils-0.166 =>
elfutils-0.168}/0001-remove-the-unneed-checking.patch (100%)
rename meta/recipes-devtools/elfutils/{elfutils-0.166 =>
elfutils-0.168}/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch (100%)
rename meta/recipes-devtools/elfutils/{elfutils-0.166 =>
elfutils-0.168}/0003-Add-mips-n64-relocation-format-hack.patch (100%)
rename meta/recipes-devtools/elfutils/{elfutils-0.166 =>
elfutils-0.168}/aarch64_uio.patch (100%)
rename meta/recipes-devtools/elfutils/{elfutils-0.166 =>
elfutils-0.168}/arm_backend.diff (100%)
rename meta/recipes-devtools/elfutils/{elfutils-0.166 =>
elfutils-0.168}/fixheadercheck.patch (100%)
rename meta/recipes-devtools/elfutils/{elfutils-0.166 =>
elfutils-0.168}/hppa_backend.diff (88%)
rename meta/recipes-devtools/elfutils/{elfutils-0.166 =>
elfutils-0.168}/kfreebsd_path.patch (100%)
create mode 100644
meta/recipes-devtools/elfutils/elfutils-0.168/m68k_backend.diff
rename meta/recipes-devtools/elfutils/{elfutils-0.166 =>
elfutils-0.168}/mips_backend.diff (88%)
rename meta/recipes-devtools/elfutils/{elfutils-0.166 =>
elfutils-0.168}/mips_readelf_w.patch (100%)
rename meta/recipes-devtools/elfutils/{elfutils-0.166 =>
elfutils-0.168}/shadow.patch (100%)
rename meta/recipes-devtools/elfutils/{elfutils-0.166 =>
elfutils-0.168}/testsuite-ignore-elflint.diff (100%)
rename meta/recipes-devtools/elfutils/{elfutils-0.166 =>
elfutils-0.168}/uclibc-support.patch (100%)
rename meta/recipes-devtools/elfutils/{elfutils_0.166.bb => elfutils_0.168.bb}
(90%)
diff --git
a/meta/recipes-devtools/elfutils/elfutils-0.166/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch
b/meta/recipes-devtools/elfutils/elfutils-0.166/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch
deleted file mode 100644
index 38b31f6..000
---
a/meta/recipes-devtools/elfutils/elfutils-0.166/0001-build-Provide-alternative
