diff mbox series

[meta-oe] ledmon: upgrade 0.93 -> 0.97

Message ID 20231116083050.132470-1-alperyasinak1@gmail.com
State Accepted
Headers show
Series [meta-oe] ledmon: upgrade 0.93 -> 0.97 | expand

Commit Message

Alper Ak Nov. 16, 2023, 8:30 a.m. UTC
* License changed GPL-2.0-only -> LGPL-2.0-only

  - LIC_FILES_CHKSUM changed COPYING -> COPYING.LIB for LGPL-2.0-only
  - Changed license headers in required source files.
  - Changed copyright years to 2022 in modified files.

* 0001-Don-t-build-with-Werror-to-fix-compile-error.patch removed because fixed in the new version.

* libpci was added as depends following this error -> configure: error: Package requirements (libpci) were not met: No package 'libpci' found

* pkgconfig added as inherit following this error -> PKG_PROG_PKG_CONFIG: command not found

Changelog:

It can be followed here: https://github.com/intel/ledmon/releases

Signed-off-by: alperak <alperyasinak1@gmail.com>
---
 ...ild-with-Werror-to-fix-compile-error.patch | 30 -------------------
 .../ledmon/{ledmon_git.bb => ledmon_0.97.bb}  | 17 +++++------
 2 files changed, 7 insertions(+), 40 deletions(-)
 delete mode 100644 meta-oe/recipes-bsp/ledmon/ledmon/0001-Don-t-build-with-Werror-to-fix-compile-error.patch
 rename meta-oe/recipes-bsp/ledmon/{ledmon_git.bb => ledmon_0.97.bb} (71%)

Comments

Khem Raj Nov. 17, 2023, 6:11 p.m. UTC | #1
This fails to build with clang for 32bit x86 e.g. qemux86

https://errors.yoctoproject.org/Errors/Details/742597/

On Thu, Nov 16, 2023 at 12:31 AM Alper Ak <alperyasinak1@gmail.com> wrote:
>
> * License changed GPL-2.0-only -> LGPL-2.0-only
>
>   - LIC_FILES_CHKSUM changed COPYING -> COPYING.LIB for LGPL-2.0-only
>   - Changed license headers in required source files.
>   - Changed copyright years to 2022 in modified files.
>
> * 0001-Don-t-build-with-Werror-to-fix-compile-error.patch removed because fixed in the new version.
>
> * libpci was added as depends following this error -> configure: error: Package requirements (libpci) were not met: No package 'libpci' found
>
> * pkgconfig added as inherit following this error -> PKG_PROG_PKG_CONFIG: command not found
>
> Changelog:
>
> It can be followed here: https://github.com/intel/ledmon/releases
>
> Signed-off-by: alperak <alperyasinak1@gmail.com>
> ---
>  ...ild-with-Werror-to-fix-compile-error.patch | 30 -------------------
>  .../ledmon/{ledmon_git.bb => ledmon_0.97.bb}  | 17 +++++------
>  2 files changed, 7 insertions(+), 40 deletions(-)
>  delete mode 100644 meta-oe/recipes-bsp/ledmon/ledmon/0001-Don-t-build-with-Werror-to-fix-compile-error.patch
>  rename meta-oe/recipes-bsp/ledmon/{ledmon_git.bb => ledmon_0.97.bb} (71%)
>
> diff --git a/meta-oe/recipes-bsp/ledmon/ledmon/0001-Don-t-build-with-Werror-to-fix-compile-error.patch b/meta-oe/recipes-bsp/ledmon/ledmon/0001-Don-t-build-with-Werror-to-fix-compile-error.patch
> deleted file mode 100644
> index 09f4993a2..000000000
> --- a/meta-oe/recipes-bsp/ledmon/ledmon/0001-Don-t-build-with-Werror-to-fix-compile-error.patch
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -Subject: [PATCH] Don't build with -Werror to fix compile error.
> -
> -|   550 |  _dump_sgpio_amd(&amd_reg->amd);
> -|       |                  ^~~~~~~~~~~~~
> -| amd_sgpio.c: In function '_write_amd_register':
> -| amd_sgpio.c:558:18: error: taking address of packed member of 'struct amd_register' may result in an unaligned pointer value [-Werror=address-of-packed-member]
> -
> -Upstream-Status: Submitted
> -https://github.com/intel/ledmon/pull/48/commits
> -
> -Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
> ----
> - configure.ac | 1 -
> - 1 file changed, 1 deletion(-)
> -
> -diff --git a/configure.ac b/configure.ac
> -index 7bc20f8..7e01bd5 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -22,7 +22,6 @@ AX_AM_CFLAGS_ADD([-Werror=format-truncation=1])
> - AX_AM_CFLAGS_ADD([-Werror=shift-negative-value])
> - AX_AM_CFLAGS_ADD([-Werror=alloca])
> - AX_AM_CFLAGS_ADD([-Werror=missing-field-initializers])
> --AX_AM_CFLAGS_ADD([-Werror])
> - AX_AM_CFLAGS_ADD([-Werror=format-signedness])
> -
> - AC_SUBST([AM_CFLAGS])
> ---
> -2.7.4
> -
> diff --git a/meta-oe/recipes-bsp/ledmon/ledmon_git.bb b/meta-oe/recipes-bsp/ledmon/ledmon_0.97.bb
> similarity index 71%
> rename from meta-oe/recipes-bsp/ledmon/ledmon_git.bb
> rename to meta-oe/recipes-bsp/ledmon/ledmon_0.97.bb
> index dbfd1e7bc..158342dbc 100644
> --- a/meta-oe/recipes-bsp/ledmon/ledmon_git.bb
> +++ b/meta-oe/recipes-bsp/ledmon/ledmon_0.97.bb
> @@ -5,28 +5,25 @@ DESCRIPTION = "The utilities are designed primarily to be used on storage server
>  "
>  HOMEPAGE = "https://github.com/intel/ledmon"
>
> -LICENSE = "GPL-2.0-only"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
> -"
> +LICENSE = "LGPL-2.0-only"
> +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
>
> -DEPENDS = "sg3-utils udev"
> +DEPENDS = "sg3-utils udev pciutils"
>
> -inherit autotools systemd
> +inherit autotools systemd pkgconfig
>
>  SYSTEMD_SERVICE:${PN} = "ledmon.service"
>
> -# 0.93
>  SRC_URI = "git://github.com/intel/ledmon;branch=master;protocol=https \
> -           file://0002-include-sys-select.h-and-sys-types.h.patch \
> -           file://0001-Don-t-build-with-Werror-to-fix-compile-error.patch \
> -          "
> +          file://0002-include-sys-select.h-and-sys-types.h.patch"
>
> -SRCREV = "1d72f9cb5c9163b2ecdf19709935720e65f5b90e"
> +SRCREV = "b0edae14e8660b80ffe0384354038a9f62e2978d"
>
>  COMPATIBLE_HOST = "(i.86|x86_64).*-linux"
>  COMPATIBLE_HOST:libc-musl = "null"
>
>  S = "${WORKDIR}/git"
> +
>  EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}' CFLAGS='${CFLAGS}'"
>
>  # The ledmon sources include headers in ${S}/config to build but not in CFLAGS.
> --
> 2.25.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#106797): https://lists.openembedded.org/g/openembedded-devel/message/106797
> Mute This Topic: https://lists.openembedded.org/mt/102623591/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Khem Raj Nov. 20, 2023, 3:51 a.m. UTC | #2
On Thu, 16 Nov 2023 11:30:50 +0300, alperak wrote:
> * License changed GPL-2.0-only -> LGPL-2.0-only
> 
>   - LIC_FILES_CHKSUM changed COPYING -> COPYING.LIB for LGPL-2.0-only
>   - Changed license headers in required source files.
>   - Changed copyright years to 2022 in modified files.
> 
> * 0001-Don-t-build-with-Werror-to-fix-compile-error.patch removed because fixed in the new version.
> 
> [...]

Applied, thanks!

[1/1] ledmon: upgrade 0.93 -> 0.97
      commit: f13feb0adfe150c922756eef366a69ccb1f1c49f

Best regards,
diff mbox series

Patch

diff --git a/meta-oe/recipes-bsp/ledmon/ledmon/0001-Don-t-build-with-Werror-to-fix-compile-error.patch b/meta-oe/recipes-bsp/ledmon/ledmon/0001-Don-t-build-with-Werror-to-fix-compile-error.patch
deleted file mode 100644
index 09f4993a2..000000000
--- a/meta-oe/recipes-bsp/ledmon/ledmon/0001-Don-t-build-with-Werror-to-fix-compile-error.patch
+++ /dev/null
@@ -1,30 +0,0 @@ 
-Subject: [PATCH] Don't build with -Werror to fix compile error.
-
-|   550 |  _dump_sgpio_amd(&amd_reg->amd);
-|       |                  ^~~~~~~~~~~~~
-| amd_sgpio.c: In function '_write_amd_register':
-| amd_sgpio.c:558:18: error: taking address of packed member of 'struct amd_register' may result in an unaligned pointer value [-Werror=address-of-packed-member]
-
-Upstream-Status: Submitted
-https://github.com/intel/ledmon/pull/48/commits
-
-Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
----
- configure.ac | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7bc20f8..7e01bd5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -22,7 +22,6 @@ AX_AM_CFLAGS_ADD([-Werror=format-truncation=1])
- AX_AM_CFLAGS_ADD([-Werror=shift-negative-value])
- AX_AM_CFLAGS_ADD([-Werror=alloca])
- AX_AM_CFLAGS_ADD([-Werror=missing-field-initializers])
--AX_AM_CFLAGS_ADD([-Werror])
- AX_AM_CFLAGS_ADD([-Werror=format-signedness])
- 
- AC_SUBST([AM_CFLAGS])
--- 
-2.7.4
-
diff --git a/meta-oe/recipes-bsp/ledmon/ledmon_git.bb b/meta-oe/recipes-bsp/ledmon/ledmon_0.97.bb
similarity index 71%
rename from meta-oe/recipes-bsp/ledmon/ledmon_git.bb
rename to meta-oe/recipes-bsp/ledmon/ledmon_0.97.bb
index dbfd1e7bc..158342dbc 100644
--- a/meta-oe/recipes-bsp/ledmon/ledmon_git.bb
+++ b/meta-oe/recipes-bsp/ledmon/ledmon_0.97.bb
@@ -5,28 +5,25 @@  DESCRIPTION = "The utilities are designed primarily to be used on storage server
 "
 HOMEPAGE = "https://github.com/intel/ledmon"
 
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
-"
+LICENSE = "LGPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
 
-DEPENDS = "sg3-utils udev"
+DEPENDS = "sg3-utils udev pciutils"
 
-inherit autotools systemd
+inherit autotools systemd pkgconfig
 
 SYSTEMD_SERVICE:${PN} = "ledmon.service"
 
-# 0.93
 SRC_URI = "git://github.com/intel/ledmon;branch=master;protocol=https \
-           file://0002-include-sys-select.h-and-sys-types.h.patch \
-           file://0001-Don-t-build-with-Werror-to-fix-compile-error.patch \
-          "
+	   file://0002-include-sys-select.h-and-sys-types.h.patch"
 
-SRCREV = "1d72f9cb5c9163b2ecdf19709935720e65f5b90e"
+SRCREV = "b0edae14e8660b80ffe0384354038a9f62e2978d"
 
 COMPATIBLE_HOST = "(i.86|x86_64).*-linux"
 COMPATIBLE_HOST:libc-musl = "null"
 
 S = "${WORKDIR}/git"
+
 EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}' CFLAGS='${CFLAGS}'"
 
 # The ledmon sources include headers in ${S}/config to build but not in CFLAGS.