Re: [OE-core] [PATCH v2] systemd.bbclass: only restart the service when it is active at systemd_postinst
ping...
--
Best regards.
Li Zhijian
|-Original Message-
|From: openembedded-core-boun...@lists.openembedded.org
|[mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of
|Li Zhijian
|Sent: Tuesday, November 05, 2013 6:14 PM
|To: Patches and discussions about the oe-core layer
|Subject: [OE-core] [PATCH v2] systemd.bbclass: only restart the service
|when it is active at systemd_postinst
|
|From: Li Zhijian
|
|If systemd_postinst is installed as a delayed package scriptlet (installed
|to /etc/rpm-postints/${PN})
|which would be executed at the first time of OS startup. And then this
script
|would block when it is
|trying to call systemctl to restart service.
|
|It seems that it is not a good timing to restart service at run-postinsts.
|I test serval services which has supported systemd(uuidd/avahi-daemon),
|all of them
|will block the startup.
|
|Steps to reproduce:
|1) Installed systemd_postinst as a delayed package scriptlet
| i.e. Append Following lines to meta/recipes-core/busybox/busybox.inc
|pkg_postinst_${PN}-syslog () {
| if [ "x$D" != "x" ] ; then
| exit 1
| fi
|}
|2) build a rootfs
|$ bitbake core-image-minimal
|3) startup this rootfs
|
|OS would block at /etc/rpm-postinsts/busybox-syslog, like follows
|[ ***] A start job is running ro Run pending postinsts
|
|This patch can fix the block problem, and make the service is consistent
|with the original status
|
|Signed-off-by: Li Zhijian
|---
| meta/classes/systemd.bbclass |3 ++-
| 1 files changed, 2 insertions(+), 1 deletions(-)
|
|diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass
|index 3700b2e..1feac06 100644
|--- a/meta/classes/systemd.bbclass
|+++ b/meta/classes/systemd.bbclass
|@@ -32,7 +32,8 @@ fi
| if type systemctl >/dev/null 2>/dev/null; then
| systemctl $OPTS ${SYSTEMD_AUTO_ENABLE} ${SYSTEMD_SERVICE}
| -if [ -z "$D" -a "${SYSTEMD_AUTO_ENABLE}" = "enable" ]; then
|+ if [ -z "$D" ] && systemctl is-active ${SYSTEMD_SERVICE}
|&>/dev/null; then
|+ # if service is active, restart it
| systemctl restart ${SYSTEMD_SERVICE}
| fi
| fi
|--
|1.7.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] systemd.bbclass: do not call 'systemctl restart ${SYSTEMD_SERVICE}' at systemd_postinst
Sau，Ross，
How about it
--
Best regards.
Li Zhijian
|-Original Message-
|From: Saul Wold [mailto:s...@linux.intel.com]
|Sent: Saturday, November 02, 2013 3:37 AM
|To: Li Zhijian; openembedded-core@lists.openembedded.org; Burton, Ross
|Subject: Re: [OE-core] [PATCH] systemd.bbclass: do not call 'systemctl
|restart ${SYSTEMD_SERVICE}' at systemd_postinst
|
|On 10/23/2013 12:34 AM, Li Zhijian wrote:
|> From: Li Zhijian
|>
|> If systemd_postinst is installed as a delayed package scriptlet
(installed
|to /etc/rpm-postints/${PN})
|> which would be executed at the first time of OS startup. And then this
|script would block when it is
|> trying to call systemctl to restart service.
|>
|> It seems that it is not a good timing to restart service at
run-postinsts.
|> I test serval services which has supported systemd(uuidd/avahi-daemon),
|all of them
|> will block the startup.
|>
|
|Ross,
|
|Can you have a look at this change.
|
|Thanks
| Sau!
|
|
|> Signed-off-by: Li Zhijian
|> ---
|> meta/classes/systemd.bbclass |4
|> 1 files changed, 0 insertions(+), 4 deletions(-)
|>
|> diff --git a/meta/classes/systemd.bbclass
|b/meta/classes/systemd.bbclass
|> index 3700b2e..7aa5459 100644
|> --- a/meta/classes/systemd.bbclass
|> +++ b/meta/classes/systemd.bbclass
|> @@ -31,10 +31,6 @@ fi
|>if type systemctl >/dev/null 2>/dev/null; then
|> systemctl $OPTS ${SYSTEMD_AUTO_ENABLE} ${SYSTEMD_SERVICE}
|> -
|> - if [ -z "$D" -a "${SYSTEMD_AUTO_ENABLE}" = "enable" ]; then
|> - systemctl restart ${SYSTEMD_SERVICE}
|> - fi
|> fi
|> }
|> -- 1.7.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
[OE-core] [PATCH v2] systemd.bbclass: only restart the service when it is active at systemd_postinst
From: Li Zhijian
If systemd_postinst is installed as a delayed package scriptlet (installed to
/etc/rpm-postints/${PN})
which would be executed at the first time of OS startup. And then this script
would block when it is
trying to call systemctl to restart service.
It seems that it is not a good timing to restart service at run-postinsts.
I test serval services which has supported systemd(uuidd/avahi-daemon), all of
them
will block the startup.
Steps to reproduce:
1) Installed systemd_postinst as a delayed package scriptlet
i.e. Append Following lines to meta/recipes-core/busybox/busybox.inc
pkg_postinst_${PN}-syslog () {
if [ "x$D" != "x" ] ; then
exit 1
fi
}
2) build a rootfs
$ bitbake core-image-minimal
3) startup this rootfs
OS would block at /etc/rpm-postinsts/busybox-syslog, like follows
[ ***] A start job is running ro Run pending postinsts
This patch can fix the block problem, and make the service is consistent with
the original status
Signed-off-by: Li Zhijian
---
meta/classes/systemd.bbclass |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass
index 3700b2e..1feac06 100644
--- a/meta/classes/systemd.bbclass
+++ b/meta/classes/systemd.bbclass
@@ -32,7 +32,8 @@ fi
if type systemctl >/dev/null 2>/dev/null; then
systemctl $OPTS ${SYSTEMD_AUTO_ENABLE} ${SYSTEMD_SERVICE}
- if [ -z "$D" -a "${SYSTEMD_AUTO_ENABLE}" = "enable" ]; then
+ if [ -z "$D" ] && systemctl is-active ${SYSTEMD_SERVICE} &>/dev/null;
then
+ # if service is active, restart it
systemctl restart ${SYSTEMD_SERVICE}
fi
fi
--
1.7.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] systemd.bbclass: only restart the service when it is running at systemd_postinst
This patch is incorrect, please ignore it
i would send v2 soon.
at 2013/11/4 18:38, Li Zhijian wrote:
From: Li Zhijian
If systemd_postinst is installed as a delayed package scriptlet (installed to
/etc/rpm-postints/${PN})
which would be executed at the first time of OS startup. And then this script
would block when it is
trying to call systemctl to restart service.
It seems that it is not a good timing to restart service at run-postinsts.
I test serval services which has supported systemd(uuidd/avahi-daemon), all of
them
will block the startup.
Steps to reproduce:
1) Installed systemd_postinst as a delayed package scriptlet
i.e. Append Following lines to meta/recipes-core/busybox/busybox.inc
pkg_postinst_${PN}-syslog () {
if [ "x$D" != "x" ] ; then
exit 1
fi
}
2) build a rootfs
# bitbake core-image-minimal
3) startup this rootfs
OS would block at /etc/rpm-postinsts/busybox-syslog, like follows
[ ***] A start job is running ro Run pending postinsts
This patch can fix the block problem, and make the service is consistent with
the original status
Signed-off-by: Li Zhijian
---
meta/classes/systemd.bbclass |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass
index 8084251..9fef667 100644
--- a/meta/classes/systemd.bbclass
+++ b/meta/classes/systemd.bbclass
@@ -30,7 +30,8 @@ fi
if type systemctl >/dev/null 2>/dev/null; then
systemctl $OPTS ${SYSTEMD_AUTO_ENABLE} ${SYSTEMD_SERVICE}
- if [ -z "$D" -a "${SYSTEMD_AUTO_ENABLE}" = "enable" ]; then
+ if [ -z "$D" ] && [ systemctl status ${SYSTEMD_SERVICE} &>/dev/null ];
then
Should be:
if [ -z "$D" ] && systemctl status ${SYSTEMD_SERVICE} &>/dev/null; then
--
Best regards.
Li Zhijian
+ # if service is running, restart it
systemctl restart ${SYSTEMD_SERVICE}
fi
fi
--
Best regards.
Li Zhijian (8555)
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] systemd.bbclass: only restart the service when it is running at systemd_postinst
From: Li Zhijian
If systemd_postinst is installed as a delayed package scriptlet (installed to
/etc/rpm-postints/${PN})
which would be executed at the first time of OS startup. And then this script
would block when it is
trying to call systemctl to restart service.
It seems that it is not a good timing to restart service at run-postinsts.
I test serval services which has supported systemd(uuidd/avahi-daemon), all of
them
will block the startup.
Steps to reproduce:
1) Installed systemd_postinst as a delayed package scriptlet
i.e. Append Following lines to meta/recipes-core/busybox/busybox.inc
pkg_postinst_${PN}-syslog () {
if [ "x$D" != "x" ] ; then
exit 1
fi
}
2) build a rootfs
# bitbake core-image-minimal
3) startup this rootfs
OS would block at /etc/rpm-postinsts/busybox-syslog, like follows
[ ***] A start job is running ro Run pending postinsts
This patch can fix the block problem, and make the service is consistent with
the original status
Signed-off-by: Li Zhijian
---
meta/classes/systemd.bbclass |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass
index 8084251..9fef667 100644
--- a/meta/classes/systemd.bbclass
+++ b/meta/classes/systemd.bbclass
@@ -30,7 +30,8 @@ fi
if type systemctl >/dev/null 2>/dev/null; then
systemctl $OPTS ${SYSTEMD_AUTO_ENABLE} ${SYSTEMD_SERVICE}
- if [ -z "$D" -a "${SYSTEMD_AUTO_ENABLE}" = "enable" ]; then
+ if [ -z "$D" ] && [ systemctl status ${SYSTEMD_SERVICE} &>/dev/null ];
then
+ # if service is running, restart it
systemctl restart ${SYSTEMD_SERVICE}
fi
fi
--
1.7.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] systemd.bbclass: do not call 'systemctl restart ${SYSTEMD_SERVICE}' at systemd_postinst
Hi Yevhen,
Well...
This bug seems different from mine.
I build from yocto-1.4.2(had accepted this patch), and bitbake
core-image-sato
In my case, when do_roofs, I make util-linux-uuidd_postinst(add
something by myself) as a delayed package scriptlet, and
it would create /etc/rpm-postinsts/util-linux-uuidd at target
rootfs
Then i start this rootfs at the first time, it would block, show
messages as follows
[ ***] A start job is running ro Run pending postinsts
I seems that systemd can't restart the service successfully at a
early time
Best regards.
Li Zhijian
at 2013/10/23 18:53, Yevhen Kyriukha wrote:
Current version of opkg has an issue with upgrading systemd
services:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=4213
Best regards,
Yevhen
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Best regards.
Li Zhijian (8555)
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] systemd.bbclass: do not call 'systemctl restart ${SYSTEMD_SERVICE}' at systemd_postinst
From: Li Zhijian
If systemd_postinst is installed as a delayed package scriptlet (installed to
/etc/rpm-postints/${PN})
which would be executed at the first time of OS startup. And then this script
would block when it is
trying to call systemctl to restart service.
It seems that it is not a good timing to restart service at run-postinsts.
I test serval services which has supported systemd(uuidd/avahi-daemon), all of
them
will block the startup.
Signed-off-by: Li Zhijian
---
meta/classes/systemd.bbclass |4
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass
index 3700b2e..7aa5459 100644
--- a/meta/classes/systemd.bbclass
+++ b/meta/classes/systemd.bbclass
@@ -31,10 +31,6 @@ fi
if type systemctl >/dev/null 2>/dev/null; then
systemctl $OPTS ${SYSTEMD_AUTO_ENABLE} ${SYSTEMD_SERVICE}
-
- if [ -z "$D" -a "${SYSTEMD_AUTO_ENABLE}" = "enable" ]; then
- systemctl restart ${SYSTEMD_SERVICE}
- fi
fi
}
-- 1.7.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] kbd: Fix coding sytle
Signed-off-by: Li Zhijian
---
meta/recipes-core/kbd/kbd_1.15.2.bb |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/kbd/kbd_1.15.2.bb
b/meta/recipes-core/kbd/kbd_1.15.2.bb
index 79ea468..c5cb66a 100644
--- a/meta/recipes-core/kbd/kbd_1.15.2.bb
+++ b/meta/recipes-core/kbd/kbd_1.15.2.bb
@@ -12,7 +12,8 @@ RCONFLICTS_${PN} = "console-tools"
PR = "r4"
-SRC_URI="${KERNELORG_MIRROR}/linux/utils/kbd/kbd-1.15.2.tar.bz2"
+SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kbd/kbd-1.15.2.tar.bz2"
+
SRC_URI[md5sum] = "e850eb91e4d3b94b194efe8e953204c5"
SRC_URI[sha256sum] =
"b3602d191eef7a6a8317fc3cd231efa40a89ac235dce57a77cac825a2a21eba6"
--
1.7.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] kbd: Allow resizecons on x86_64
Signed-off-by: Li Zhijian
---
.../kbd-1.15.2/Allow-resizecons-on-x86_64.patch| 28
meta/recipes-core/kbd/kbd_1.15.2.bb|3 +-
2 files changed, 30 insertions(+), 1 deletions(-)
create mode 100644
meta/recipes-core/kbd/kbd-1.15.2/Allow-resizecons-on-x86_64.patch
diff --git a/meta/recipes-core/kbd/kbd-1.15.2/Allow-resizecons-on-x86_64.patch
b/meta/recipes-core/kbd/kbd-1.15.2/Allow-resizecons-on-x86_64.patch
new file mode 100644
index 000..1a49846
--- /dev/null
+++ b/meta/recipes-core/kbd/kbd-1.15.2/Allow-resizecons-on-x86_64.patch
@@ -0,0 +1,28 @@
+Upstream-status: Accepted
+This patch had accepted at kdb-1.5.4
+
+From e069cfa96b41a6714118e15496cdd6b83fc16ad2 Mon Sep 17 00:00:00 2001
+From: Alexey Gladkov
+Date: Mon, 27 Feb 2012 14:30:50 +0400
+Subject: [PATCH] Allow resizecons on x86_64
+
+Signed-off-by: Alexey Gladkov
+---
+ configure.ac |1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a8115ed..b58f3bd 100644
+--- a/configure.ac
b/configure.ac
+@@ -62,6 +62,7 @@ AM_CONDITIONAL(KEYCODES_PROGS, test "$KEYCODES_PROGS" =
"yes")
+
+ case $host_cpu in
+ i?86*) RESIZECONS_PROGS=yes ;;
++ x86_64*) RESIZECONS_PROGS=yes ;;
+ *) RESIZECONS_PROGS=no ;;
+ esac
+ AM_CONDITIONAL(RESIZECONS_PROGS, test "$RESIZECONS_PROGS" = "yes")
+--
+1.7.1
+
diff --git a/meta/recipes-core/kbd/kbd_1.15.2.bb
b/meta/recipes-core/kbd/kbd_1.15.2.bb
index c5cb66a..a150ff1 100644
--- a/meta/recipes-core/kbd/kbd_1.15.2.bb
+++ b/meta/recipes-core/kbd/kbd_1.15.2.bb
@@ -12,7 +12,8 @@ RCONFLICTS_${PN} = "console-tools"
PR = "r4"
-SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kbd/kbd-1.15.2.tar.bz2"
+SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kbd/kbd-1.15.2.tar.bz2 \
+ file://Allow-resizecons-on-x86_64.patch"
SRC_URI[md5sum] = "e850eb91e4d3b94b194efe8e953204c5"
SRC_URI[sha256sum] =
"b3602d191eef7a6a8317fc3cd231efa40a89ac235dce57a77cac825a2a21eba6"
--
1.7.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libxml2: make xmlcatalog work via --with-catalog
Previously,when execute xmlcatalog, it shows as follows:
"libxml was not compiled with catalog and output support"
So it seems more reasonable to make xmlcatalog work
by using --with-catalog instead of --without-catalog
Signed-off-by: Li Zhijian
---
meta/recipes-core/libxml/libxml2.inc |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/libxml/libxml2.inc
b/meta/recipes-core/libxml/libxml2.inc
index 7fb2644..7a6a638 100644
--- a/meta/recipes-core/libxml/libxml2.inc
+++ b/meta/recipes-core/libxml/libxml2.inc
@@ -29,7 +29,7 @@ do_configure_prepend () {
sed -i -e '/.*ansidecl.h.*/d' ${S}/configure.in
}
-EXTRA_OECONF = "--without-python --without-debug --without-legacy
--without-catalog --without-docbook --with-c14n --without-lzma
--with-fexceptions"
+EXTRA_OECONF = "--without-python --without-debug --without-legacy
--with-catalog --without-docbook --with-c14n --without-lzma --with-fexceptions"
EXTRA_OECONF_class-native = "--with-python=${STAGING_BINDIR}/python
--without-legacy --with-catalog --without-docbook --with-c14n --without-lzma"
EXTRA_OECONF_class-nativesdk = "--with-python=${STAGING_BINDIR}/python
--without-legacy --with-catalog --without-docbook --with-c14n --without-lzma"
EXTRA_OECONF_linuxstdbase = "--without-python --with-debug --with-legacy
--with-catalog --with-docbook --with-c14n --without-lzma"
--
1.7.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [Question] libxml: How about add --with-catalog to EXTRA_OECONF ?
libxml2 is built successfully with option of --with-catalog,and xmlcatalog work well Maybe I would send a patch to fix it. Thanks Li at 2013-8-29 14:52, Robert Yang wrote: I took a look at the libxml's git log, didn't see the explicit reason that why use the --without-catalog, so it seems reasonable to use the --with-catalog which will make the xmlcatalog work (if it can be built well with the option.) // Robert On 08/29/2013 09:46 AM, Li Zhijian wrote: Hi, I had build libxml and executed xmlcatalog It shows follow messages # xmlcatalog --help libxml was not compiled with catalog and output support meta/recipes-core/libxml/libxml2.inc: 32 EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n --without-lzma --with-fexceptions" Is it reasonable to add --without-catalog EXTRA_OECONF ? Thanks Best regards. Li Zhijian ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Best regards. Li Zhijian (8555) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [Question] libxml: How about add --with-catalog to EXTRA_OECONF ?
Hi, I had build libxml and executed xmlcatalog It shows follow messages # xmlcatalog --help libxml was not compiled with catalog and output support meta/recipes-core/libxml/libxml2.inc: 32 EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n --without-lzma --with-fexceptions" Is it reasonable to add --without-catalog EXTRA_OECONF ? Thanks Best regards. Li Zhijian ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] grep-2.5.1a: fix grep for LSB compliance
at 2013-8-27 14:52, Saul Wold wrote:
On 08/26/2013 09:32 PM, Li Zhijian wrote:
...skip... at 2013-8-27 9:00, Saul Wold wrote:
diff --git a/meta/recipes-extended/grep/grep_2.5.1a.bb
b/meta/recipes-extended/grep/grep_2.5.1a.bb index
088959c..d964d84 100644 ---
a/meta/recipes-extended/grep/grep_2.5.1a.bb +++
b/meta/recipes-extended/grep/grep_2.5.1a.bb @@ -5,7 +5,7 @@
SECTION = "console/utils" LICENSE = "GPLv2" LIC_FILES_CHKSUM =
"file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
-PR = "r2" +PR = "r3"
SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \
file://uclibc-fix.patch \ @@ -13,8 +13,25 @@ SRC_URI =
"${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \ file://gettext.patch \
file://fix64-int-to-pointer.patch \ file://Makevars \ -
file://grep-CVE-2012-5667.patch \
Why are you removing this patch?
Will an update to 2.5.3 accomplish the same thing as these
patches?
Also all of your patches above are missing Upstream-Status and
Signed-off-by:
See the Patch Guildlines on OE-Core:
http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Thanks
Sau!
...skip...
+ file://grep-CVE-2012-5667.patch \
...skip...
Thank a lots for your comments.
This patch is not removed ,it is here ↑
I don't know what's fixed bettwen 2.5.1a an 2.5.3, but grep-2.5.3
LICENSE is GPLv3+ differed from 2.5.1a(GPLv2)
The Guildlines is very helpful for me. But those patch is come from
grep-2.5.1-55.el5.src.rpm and I have not research this patch's
Upstream-Status and Signed-off-by So I am sorry about that
Please review the recipes and licenesing, since it seems the we might
have multiple versions and the license fields are incorrect for both.
If there are both v2 and v3 versions, we need to ensure which is correct.
As I known,
grep-2.5.1: GPL
grep-2.5.1a: GPLv2
grep-2.5.3 or later: GPLv3
I think both of them(2.5.1a and 2.14) are in the correct license right now.
Thanks
Li
Thanks
Sau!
Thanks Li,
--
Best regards.
Li Zhijian (8555)
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] grep-2.5.1a: fix grep for LSB compliance
at 2013-8-27 18:43, Phil Blundell wrote:
On Mon, 2013-08-26 at 18:00 -0700, Saul Wold wrote:
On 08/27/2013 02:43 AM, Li Zhijian wrote:
add patch from grep-2.5.1-55.el5.src.rpm and
enable configration option of --without-include-regex
LSB core-tests failed at /tset/LI18NUX2K.L1/utils/grep-tp/T.grep-tp
5,T.egrep-tp 5
which is intend to verify this utility can perform pattern matching in searches
without regard to case if -i option is specified.
Signed-off-by: Li Zhijian
SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \
file://uclibc-fix.patch \
@@ -13,8 +13,25 @@ SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \
file://gettext.patch \
file://fix64-int-to-pointer.patch \
file://Makevars \
- file://grep-CVE-2012-5667.patch \
Why are you removing this patch?
He didn't actually remove it, he just moved it further down the list.
But...
file://fix-for-texinfo-5.1.patch \
+ file://grep-2.5.1-fgrep.patch \
+ file://grep-2.5.1-bracket.patch \
+ file://grep-2.5-i18n.patch \
+ file://grep-2.5.1-oi.patch \
+ file://grep-2.5.1-manpage.patch \
+ file://grep-2.5.1-color.patch \
+ file://grep-2.5.1-icolor.patch \
+ file://grep-skip.patch \
+ file://grep-2.5.1-egf-speedup.patch \
+ file://grep-2.5.1-dfa-optional.patch \
+ file://grep-2.5.1-tests.patch \
+ file://grep-2.5.1-w.patch \
+ file://grep-P.patch \
+ file://grep-CVE-2012-5667.patch \
+ file://grep-empty-pattern.patch \
+ file://grep-bz460641.patch \
+ file://grep-bz434934.patch \
+ file://grep-man-label.patch \
... it's fairly hard to believe that all these patches are really
necessary to fix the problem with "grep -i" that's described in the
checkin message. It looks as though a more accurate description of this
change would be something like "grep-2.5.1a: import all patches from
RHEL".
Agree, you are right.
It is easier for me to import all patches from RHEL rather than analysising
which
are problem fixed patches.
Also, although adding --without-included-regex probably is a good thing
(and probably ought to be done for grep-2.14 as well) it's not very
obvious that this has anything to do with the LSB fix either.
This option --without-included-regex at grep-2.5.1a is also necessary to fix
LSB core-test
Otherwise /tset/LI18NUX2K.L1/utils/grep-tp/T.grep-tp 5,T.egrep-tp 5 would FAIL。
Thanks
Li
p.
--
Best regards.
Li Zhijian (8555)
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] grep-2.5.1a: fix grep for LSB compliance
...skip...
at 2013-8-27 9:00, Saul Wold wrote:
diff --git a/meta/recipes-extended/grep/grep_2.5.1a.bb
b/meta/recipes-extended/grep/grep_2.5.1a.bb
index 088959c..d964d84 100644
--- a/meta/recipes-extended/grep/grep_2.5.1a.bb
+++ b/meta/recipes-extended/grep/grep_2.5.1a.bb
@@ -5,7 +5,7 @@ SECTION = "console/utils"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
-PR = "r2"
+PR = "r3"
SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \
file://uclibc-fix.patch \
@@ -13,8 +13,25 @@ SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \
file://gettext.patch \
file://fix64-int-to-pointer.patch \
file://Makevars \
- file://grep-CVE-2012-5667.patch \
Why are you removing this patch?
Will an update to 2.5.3 accomplish the same thing as these patches?
Also all of your patches above are missing Upstream-Status and Signed-off-by:
See the Patch Guildlines on OE-Core:
http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Thanks
Sau!
...skip...
+ file://grep-CVE-2012-5667.patch \
...skip...
Thank a lots for your comments.
This patch is not removed ,it is here ↑
I don't know what's fixed bettwen 2.5.1a an 2.5.3, but
grep-2.5.3 LICENSE is GPLv3+ differed from 2.5.1a(GPLv2)
The Guildlines is very helpful for me. But those patch is come
from grep-2.5.1-55.el5.src.rpm and I have not research this patch's
Upstream-Status and Signed-off-by
So I am sorry about that
Thanks
Li,
--
Best regards.
Li Zhijian (8555)
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
