* Re: [Buildroot] [PATCH] package/mcelog: bump to version 184
2022-07-26 17:45 [Buildroot] [PATCH] package/mcelog: bump to version 184 Vincent Fazio
@ 2022-07-26 18:55 ` Arnout Vandecappelle
2022-07-26 19:52 ` Thomas Petazzoni via buildroot
2022-07-27 13:05 ` [Buildroot] [PATCH v2] " Vincent Fazio
2 siblings, 0 replies; 5+ messages in thread
From: Arnout Vandecappelle @ 2022-07-26 18:55 UTC (permalink / raw)
To: Vincent Fazio, buildroot; +Cc: Romain Naour
Hi Vincent,
On 26/07/2022 19:45, Vincent Fazio wrote:
> Minor changes necessary to fix building the package:
> - Call out host-python3 in the makefile
> - Patch genconfig.py to not use hardcoded python3 shebang
>
> Signed-off-by: Vincent Fazio <vfazio@xes-inc.com>
> ---
> .../0001-Use-env-as-the-shebang-target.patch | 33 +++++++++++++++++++
> package/mcelog/mcelog.hash | 2 +-
> package/mcelog/mcelog.mk | 3 +-
> 3 files changed, 36 insertions(+), 2 deletions(-)
> create mode 100644 package/mcelog/0001-Use-env-as-the-shebang-target.patch
>
> diff --git a/package/mcelog/0001-Use-env-as-the-shebang-target.patch b/package/mcelog/0001-Use-env-as-the-shebang-target.patch
> new file mode 100644
> index 0000000000..ce9fc9c44c
> --- /dev/null
> +++ b/package/mcelog/0001-Use-env-as-the-shebang-target.patch
> @@ -0,0 +1,33 @@
> +From c6eee289225beccfc40c73d31baa4179abc5ac57 Mon Sep 17 00:00:00 2001
> +From: Vincent Fazio <vfazio@xes-inc.com>
> +Date: Thu, 21 Jul 2022 16:56:11 -0500
> +Subject: [PATCH] Use env as the shebang target
> +
> +Let the script be flexible when it comes to finding the python3
> +interpreter.
> +
> +Some build wrappers, such as buildroot, will provide a python3 binary
> +for use by scripts but it will not be at the fixed path of /usr/bin/.
> +Instead it will be available in a path defined in $PATH
> +
> +Using env as the shebang target with python3 as the command will follow
> +$PATH search priority when determining the python3 interpreter.
> +
> +Signed-off-by: Vincent Fazio <vfazio@xes-inc.com>
Please include a link to your upstream contribution, i.e.:
Upstream: https://github.com/andikleen/mcelog/pull/xxxx
Regards,
Arnout
> +---
> + genconfig.py | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/genconfig.py b/genconfig.py
> +index a387cb3..48c1b3e 100755
> +--- a/genconfig.py
> ++++ b/genconfig.py
> +@@ -1,4 +1,4 @@
> +-#!/usr/bin/python3
> ++#!/usr/bin/env python3
> + # generate man config documentation from mcelog.conf example
> + # genconfig.py mcelog.conf intro.html
> + import sys
> +--
> +2.25.1
> +
> diff --git a/package/mcelog/mcelog.hash b/package/mcelog/mcelog.hash
> index 598aa648fd..94b5f2cc37 100644
> --- a/package/mcelog/mcelog.hash
> +++ b/package/mcelog/mcelog.hash
> @@ -1,3 +1,3 @@
> # Locally computed
> -sha256 e9c82b565da06673c2630f9e6bc668634ad7d2c7f13c70db1900cce110ae62dc mcelog-180.tar.gz
> +sha256 067d52006f0aa42045acc6d9c04d590362448bacd8ef415d42729e6f35825028 mcelog-184.tar.gz
> sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE
> diff --git a/package/mcelog/mcelog.mk b/package/mcelog/mcelog.mk
> index da7785ca91..6a0d806661 100644
> --- a/package/mcelog/mcelog.mk
> +++ b/package/mcelog/mcelog.mk
> @@ -4,11 +4,12 @@
> #
> ################################################################################
>
> -MCELOG_VERSION = 180
> +MCELOG_VERSION = 184
> MCELOG_SITE = $(call github,andikleen,mcelog,v$(MCELOG_VERSION))
> MCELOG_LICENSE = GPL-2.0
> MCELOG_LICENSE_FILES = LICENSE
> MCELOG_SELINUX_MODULES = mcelog
> +MCELOG_DEPENDENCIES = host-python3
>
> define MCELOG_BUILD_CMDS
> $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH] package/mcelog: bump to version 184
2022-07-26 17:45 [Buildroot] [PATCH] package/mcelog: bump to version 184 Vincent Fazio
2022-07-26 18:55 ` Arnout Vandecappelle
@ 2022-07-26 19:52 ` Thomas Petazzoni via buildroot
2022-07-27 11:38 ` [Buildroot] [External] - " Vincent Fazio
2022-07-27 13:05 ` [Buildroot] [PATCH v2] " Vincent Fazio
2 siblings, 1 reply; 5+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-07-26 19:52 UTC (permalink / raw)
To: Vincent Fazio; +Cc: Romain Naour, buildroot
Hello Vincent,
On Tue, 26 Jul 2022 12:45:05 -0500
Vincent Fazio <vfazio@xes-inc.com> wrote:
> diff --git a/package/mcelog/mcelog.hash b/package/mcelog/mcelog.hash
> index 598aa648fd..94b5f2cc37 100644
> --- a/package/mcelog/mcelog.hash
> +++ b/package/mcelog/mcelog.hash
> @@ -1,3 +1,3 @@
> # Locally computed
> -sha256 e9c82b565da06673c2630f9e6bc668634ad7d2c7f13c70db1900cce110ae62dc mcelog-180.tar.gz
> +sha256 067d52006f0aa42045acc6d9c04d590362448bacd8ef415d42729e6f35825028 mcelog-184.tar.gz
> sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE
> diff --git a/package/mcelog/mcelog.mk b/package/mcelog/mcelog.mk
> index da7785ca91..6a0d806661 100644
> --- a/package/mcelog/mcelog.mk
> +++ b/package/mcelog/mcelog.mk
> @@ -4,11 +4,12 @@
> #
> ################################################################################
>
> -MCELOG_VERSION = 180
> +MCELOG_VERSION = 184
> MCELOG_SITE = $(call github,andikleen,mcelog,v$(MCELOG_VERSION))
> MCELOG_LICENSE = GPL-2.0
> MCELOG_LICENSE_FILES = LICENSE
> MCELOG_SELINUX_MODULES = mcelog
> +MCELOG_DEPENDENCIES = host-python3
If I read correctly the Makefile, it seems like host-python3 is only
needed to generate the manpage, which we don't need. Perhaps it would
be useful instead to contribute upstream a make variable that would
allow to disable building the manpage, and therefore get rid of the
host-python3 dependency?
Best regards,
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Buildroot] [External] - Re: [PATCH] package/mcelog: bump to version 184
2022-07-26 19:52 ` Thomas Petazzoni via buildroot
@ 2022-07-27 11:38 ` Vincent Fazio
0 siblings, 0 replies; 5+ messages in thread
From: Vincent Fazio @ 2022-07-27 11:38 UTC (permalink / raw)
To: Thomas Petazzoni; +Cc: Romain Naour, buildroot@buildroot.org
Thomas,
> -----Original Message-----
> From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> Sent: Tuesday, July 26, 2022 2:53 PM
> To: Vincent Fazio <vfazio@xes-inc.com>
> Cc: buildroot@buildroot.org; Romain Naour <romain.naour@gmail.com>
> Subject: [External] - Re: [Buildroot] [PATCH] package/mcelog: bump to
> version 184
>
> Hello Vincent,
>
> On Tue, 26 Jul 2022 12:45:05 -0500
> Vincent Fazio <vfazio@xes-inc.com> wrote:
>
> > diff --git a/package/mcelog/mcelog.hash b/package/mcelog/mcelog.hash
> > index 598aa648fd..94b5f2cc37 100644
> > --- a/package/mcelog/mcelog.hash
> > +++ b/package/mcelog/mcelog.hash
> > @@ -1,3 +1,3 @@
> > # Locally computed
> > -sha256
> e9c82b565da06673c2630f9e6bc668634ad7d2c7f13c70db1900cce110ae62dc
> mcelog-180.tar.gz
> > +sha256
> 067d52006f0aa42045acc6d9c04d590362448bacd8ef415d42729e6f35825028
> mcelog-184.tar.gz
> > sha256
> 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643
> LICENSE
> > diff --git a/package/mcelog/mcelog.mk b/package/mcelog/mcelog.mk
> > index da7785ca91..6a0d806661 100644
> > --- a/package/mcelog/mcelog.mk
> > +++ b/package/mcelog/mcelog.mk
> > @@ -4,11 +4,12 @@
> > #
> >
> ##########################################################
> ######################
> >
> > -MCELOG_VERSION = 180
> > +MCELOG_VERSION = 184
> > MCELOG_SITE = $(call github,andikleen,mcelog,v$(MCELOG_VERSION))
> > MCELOG_LICENSE = GPL-2.0
> > MCELOG_LICENSE_FILES = LICENSE
> > MCELOG_SELINUX_MODULES = mcelog
> > +MCELOG_DEPENDENCIES = host-python3
>
> If I read correctly the Makefile, it seems like host-python3 is only
> needed to generate the manpage, which we don't need. Perhaps it would
> be useful instead to contribute upstream a make variable that would
> allow to disable building the manpage, and therefore get rid of the
> host-python3 dependency?
>
This is true. I can look into doing this, I was just trying to be as minimally invasive as possible.
> Best regards,
>
> Thomas
> --
> Thomas Petazzoni, co-owner and CEO, Bootlin
> Embedded Linux and Kernel engineering and training
> https://bootlin.com
> CAUTION: This email originated from outside of the organization. Do not click
> links or open attachments unless you recognize the sender and know the
> content is safe.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v2] package/mcelog: bump to version 184
2022-07-26 17:45 [Buildroot] [PATCH] package/mcelog: bump to version 184 Vincent Fazio
2022-07-26 18:55 ` Arnout Vandecappelle
2022-07-26 19:52 ` Thomas Petazzoni via buildroot
@ 2022-07-27 13:05 ` Vincent Fazio
2 siblings, 0 replies; 5+ messages in thread
From: Vincent Fazio @ 2022-07-27 13:05 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour, Vincent Fazio, Thomas Petazzoni
Include a patch to introduce the `install-nodoc` make target to avoid
a dependency on host-python3 for manpage generation.
Upstream: https://github.com/andikleen/mcelog/pull/109
Signed-off-by: Vincent Fazio <vfazio@xes-inc.com>
---
Changes v1 -> v2:
- change patch to add install-nodoc make target (suggested by Thomas)
- drop host-python3 dependency (suggested by Thomas)
- document upstream PR (requested by Arnout)
...01-Makefile-add-install-nodoc-target.patch | 65 +++++++++++++++++++
package/mcelog/mcelog.hash | 2 +-
package/mcelog/mcelog.mk | 4 +-
3 files changed, 68 insertions(+), 3 deletions(-)
create mode 100644 package/mcelog/0001-Makefile-add-install-nodoc-target.patch
diff --git a/package/mcelog/0001-Makefile-add-install-nodoc-target.patch b/package/mcelog/0001-Makefile-add-install-nodoc-target.patch
new file mode 100644
index 0000000000..a36a54c73c
--- /dev/null
+++ b/package/mcelog/0001-Makefile-add-install-nodoc-target.patch
@@ -0,0 +1,65 @@
+From c224ad8bafe859d640dfaf67d396c38c73880409 Mon Sep 17 00:00:00 2001
+From: Vincent Fazio <vfazio@xes-inc.com>
+Date: Wed, 27 Jul 2022 07:18:37 -0500
+Subject: [PATCH] Makefile: add install-nodoc target
+
+This target is useful for "essentials only" installs for embedded
+environments with the added benefit of not requiring a python
+interpreter for installing the package.
+
+Suggested-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+Signed-off-by: Vincent Fazio <vfazio@xes-inc.com>
+---
+ Makefile | 19 +++++++++++--------
+ 1 file changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 339b8dd..50a322b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -28,7 +28,7 @@ TRIGGERS=cache-error-trigger dimm-error-trigger page-error-trigger \
+
+ all: mcelog
+
+-.PHONY: install clean depend FORCE
++.PHONY: install install-nodoc clean depend FORCE
+
+ OBJ := p4.o k8.o mcelog.o dmi.o tsc.o core2.o bitfield.o intel.o \
+ nehalem.o dunnington.o tulsa.o config.o memutil.o msg.o \
+@@ -50,16 +50,11 @@ SRC := $(OBJ:.o=.c)
+ mcelog: ${OBJ} version.o
+
+ # dbquery intentionally not installed by default
+-install: mcelog mcelog.conf mcelog.conf.5 mcelog.triggers.5
+- mkdir -p $(DESTDIR)${etcprefix}/etc/mcelog $(DESTDIR)${prefix}/sbin $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man8
+- install -m 755 -p mcelog $(DESTDIR)${prefix}/sbin/mcelog
++install: install-nodoc mcelog.conf.5 mcelog.triggers.5
++ mkdir -p $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man8
+ install -m 644 -p mcelog.8 $(DESTDIR)$(MANDIR)/man8
+ install -m 644 -p mcelog.conf.5 $(DESTDIR)$(MANDIR)/man5
+ install -m 644 -p mcelog.triggers.5 $(DESTDIR)$(MANDIR)/man5
+- install -m 644 -p -b mcelog.conf $(DESTDIR)${etcprefix}/etc/mcelog/mcelog.conf
+- for i in ${TRIGGERS} ; do \
+- install -m 755 -p -b triggers/$$i $(DESTDIR)${etcprefix}/etc/mcelog ; \
+- done
+ ifdef DOCDIR
+ install -d 755 $(DESTDIR)${DOCDIR}
+ install -m 644 -p ${DOC} $(DESTDIR)${DOCDIR}
+@@ -68,6 +63,14 @@ else
+ echo "Consider defining DOCDIR to install additional documentation"
+ endif
+
++install-nodoc: mcelog mcelog.conf
++ mkdir -p $(DESTDIR)${etcprefix}/etc/mcelog $(DESTDIR)${prefix}/sbin
++ install -m 755 -p mcelog $(DESTDIR)${prefix}/sbin/mcelog
++ install -m 644 -p -b mcelog.conf $(DESTDIR)${etcprefix}/etc/mcelog/mcelog.conf
++ for i in ${TRIGGERS} ; do \
++ install -m 755 -p -b triggers/$$i $(DESTDIR)${etcprefix}/etc/mcelog ; \
++ done
++
+ mcelog.conf.5: mcelog.conf config-intro.man
+ ./genconfig.py mcelog.conf config-intro.man > mcelog.conf.5
+
+--
+2.25.1
+
diff --git a/package/mcelog/mcelog.hash b/package/mcelog/mcelog.hash
index 598aa648fd..94b5f2cc37 100644
--- a/package/mcelog/mcelog.hash
+++ b/package/mcelog/mcelog.hash
@@ -1,3 +1,3 @@
# Locally computed
-sha256 e9c82b565da06673c2630f9e6bc668634ad7d2c7f13c70db1900cce110ae62dc mcelog-180.tar.gz
+sha256 067d52006f0aa42045acc6d9c04d590362448bacd8ef415d42729e6f35825028 mcelog-184.tar.gz
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE
diff --git a/package/mcelog/mcelog.mk b/package/mcelog/mcelog.mk
index da7785ca91..24aeb5b519 100644
--- a/package/mcelog/mcelog.mk
+++ b/package/mcelog/mcelog.mk
@@ -4,7 +4,7 @@
#
################################################################################
-MCELOG_VERSION = 180
+MCELOG_VERSION = 184
MCELOG_SITE = $(call github,andikleen,mcelog,v$(MCELOG_VERSION))
MCELOG_LICENSE = GPL-2.0
MCELOG_LICENSE_FILES = LICENSE
@@ -15,7 +15,7 @@ define MCELOG_BUILD_CMDS
endef
define MCELOG_INSTALL_TARGET_CMDS
- $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) DESTDIR=$(TARGET_DIR) install
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) DESTDIR=$(TARGET_DIR) install-nodoc
endef
define MCELOG_INSTALL_INIT_SYSTEMD
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread