summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-networking/recipes-support/openipmi/files/0001-m4-ax_python_devel.m4-do-not-check-for-distutils.patch41
-rw-r--r--meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch9
-rw-r--r--meta-networking/recipes-support/openipmi/files/include_sys_types.patch5
-rw-r--r--meta-networking/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch6
-rw-r--r--meta-networking/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch3
-rw-r--r--meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch49
-rw-r--r--meta-networking/recipes-support/openipmi/openipmi_2.0.34.bb (renamed from meta-networking/recipes-support/openipmi/openipmi_2.0.32.bb)12
7 files changed, 16 insertions, 109 deletions
diff --git a/meta-networking/recipes-support/openipmi/files/0001-m4-ax_python_devel.m4-do-not-check-for-distutils.patch b/meta-networking/recipes-support/openipmi/files/0001-m4-ax_python_devel.m4-do-not-check-for-distutils.patch
deleted file mode 100644
index 00956fb117..0000000000
--- a/meta-networking/recipes-support/openipmi/files/0001-m4-ax_python_devel.m4-do-not-check-for-distutils.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 3a35611687864cf3599712d0d2ff54532b0118ac Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Sun, 3 Oct 2021 21:42:32 +0200
4Subject: [PATCH] m4/ax_python_devel.m4: do not check for distutils
5
6With py 3.10 this prints a deprecation warning which is
7taken as an error. Upstream should rework the code to not
8use distuils.
9
10Upstream-Status: Inappropriate [needs a proper fix upstream]
11Signed-off-by: Alexander Kanavin <alex@linutronix.de>
12---
13 m4/ax_python_devel.m4 | 15 ---------------
14 1 file changed, 15 deletions(-)
15
16diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4
17index e0804c5..cfc0b24 100644
18--- a/m4/ax_python_devel.m4
19+++ b/m4/ax_python_devel.m4
20@@ -138,21 +138,6 @@ variable to configure. See ``configure --help'' for reference.
21 fi
22 fi
23
24- #
25- # Check if you have distutils, else fail
26- #
27- AC_MSG_CHECKING([for the distutils Python package])
28- ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
29- if test -z "$ac_distutils_result"; then
30- AC_MSG_RESULT([yes])
31- else
32- AC_MSG_RESULT([no])
33- AC_MSG_ERROR([cannot import Python module "distutils".
34-Please check your Python installation. The error was:
35-$ac_distutils_result])
36- PYTHON_VERSION=""
37- fi
38-
39 #
40 # Check for Python include path
41 #
diff --git a/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch b/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch
index 2434884248..5bbccdcbf6 100644
--- a/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch
+++ b/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch
@@ -1,4 +1,4 @@
1From 7854c60c92243adb14ea89e16fc226d2e47dd4f9 Mon Sep 17 00:00:00 2001 1From 0ccfefe624e25f937b27b2caf3671e80c2c29391 Mon Sep 17 00:00:00 2001
2From: Aws Ismail <aws.ismail@windriver.com> 2From: Aws Ismail <aws.ismail@windriver.com>
3Date: Thu, 7 Jun 2012 16:00:13 -0400 3Date: Thu, 7 Jun 2012 16:00:13 -0400
4Subject: [PATCH] Fix symlink install error in cmdlang 4Subject: [PATCH] Fix symlink install error in cmdlang
@@ -9,17 +9,18 @@ creating a symbolic link for opeipmish in openipmi/cmdlang
9Upstream-Status: Pending 9Upstream-Status: Pending
10 10
11Signed-off-by: Aws Ismail <aws.ismail@windriver.com> 11Signed-off-by: Aws Ismail <aws.ismail@windriver.com>
12
12--- 13---
13 cmdlang/Makefile.am | 1 + 14 cmdlang/Makefile.am | 1 +
14 1 file changed, 1 insertion(+) 15 1 file changed, 1 insertion(+)
15 16
16diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am 17diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am
17index 0ca3827..d9a941f 100644 18index 7235446..4a81ae3 100644
18--- a/cmdlang/Makefile.am 19--- a/cmdlang/Makefile.am
19+++ b/cmdlang/Makefile.am 20+++ b/cmdlang/Makefile.am
20@@ -35,6 +35,7 @@ openipmish_LDADD = libOpenIPMIcmdlang.la \ 21@@ -41,6 +41,7 @@ openipmish_CFLAGS = -Wall -Wsign-compare -I$(top_builddir)/include \
21 # compatability. 22 # compatability.
22 install-data-local: 23 install-exec-hook:
23 rm -f $(DESTDIR)$(bindir)/ipmish 24 rm -f $(DESTDIR)$(bindir)/ipmish
24+ mkdir -p $(DESTDIR)$(bindir)/ 25+ mkdir -p $(DESTDIR)$(bindir)/
25 $(LN_S) openipmish $(DESTDIR)$(bindir)/ipmish 26 $(LN_S) openipmish $(DESTDIR)$(bindir)/ipmish
diff --git a/meta-networking/recipes-support/openipmi/files/include_sys_types.patch b/meta-networking/recipes-support/openipmi/files/include_sys_types.patch
index 61b39995a6..18129e6fcb 100644
--- a/meta-networking/recipes-support/openipmi/files/include_sys_types.patch
+++ b/meta-networking/recipes-support/openipmi/files/include_sys_types.patch
@@ -1,4 +1,4 @@
1From 4f41e090e33a00117a27f0c77b6338fb8b495f37 Mon Sep 17 00:00:00 2001 1From d667aedc37aeabdb9f8574ee0b9cf85b844ca2d2 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 2 Jun 2017 21:58:32 -0700 3Date: Fri, 2 Jun 2017 21:58:32 -0700
4Subject: [PATCH] openipmi: Fix build with musl 4Subject: [PATCH] openipmi: Fix build with musl
@@ -12,12 +12,13 @@ ui.c:340:5: error: unknown type name 'u_int32_t'; did you mean 'uint32_t'?
12Upstream-Status: Pending 12Upstream-Status: Pending
13 13
14Signed-off-by: Khem Raj <raj.khem@gmail.com> 14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15
15--- 16---
16 ui/ui.c | 1 + 17 ui/ui.c | 1 +
17 1 file changed, 1 insertion(+) 18 1 file changed, 1 insertion(+)
18 19
19diff --git a/ui/ui.c b/ui/ui.c 20diff --git a/ui/ui.c b/ui/ui.c
20index 529ff22..066d118 100644 21index 9c6a51f..34f7e34 100644
21--- a/ui/ui.c 22--- a/ui/ui.c
22+++ b/ui/ui.c 23+++ b/ui/ui.c
23@@ -42,6 +42,7 @@ 24@@ -42,6 +42,7 @@
diff --git a/meta-networking/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch b/meta-networking/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch
index c4559c97b7..d9ee5cc28f 100644
--- a/meta-networking/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch
+++ b/meta-networking/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch
@@ -1,4 +1,4 @@
1From 6542ebe7a0d37dee8e9afb856feb8f6c3d334632 Mon Sep 17 00:00:00 2001 1From 7d9f6526dbcd46130d279c363d38781969807f74 Mon Sep 17 00:00:00 2001
2From: Jackie Huang <jackie.huang@windriver.com> 2From: Jackie Huang <jackie.huang@windriver.com>
3Date: Mon, 29 Dec 2014 18:16:04 +0800 3Date: Mon, 29 Dec 2014 18:16:04 +0800
4Subject: [PATCH] ipmi-init: fix the arguments 4Subject: [PATCH] ipmi-init: fix the arguments
@@ -10,12 +10,13 @@ not a string.
10Upstream-Status: Inappropriate [OE specific] 10Upstream-Status: Inappropriate [OE specific]
11 11
12Signed-off-by: Jackie Huang <jackie.huang@windriver.com> 12Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
13
13--- 14---
14 ipmi.init | 6 +++--- 15 ipmi.init | 6 +++---
15 1 file changed, 3 insertions(+), 3 deletions(-) 16 1 file changed, 3 insertions(+), 3 deletions(-)
16 17
17diff --git a/ipmi.init b/ipmi.init 18diff --git a/ipmi.init b/ipmi.init
18index ea10b11..aac9f83 100644 19index bd80f0d..53305bb 100644
19--- a/ipmi.init 20--- a/ipmi.init
20+++ b/ipmi.init 21+++ b/ipmi.init
21@@ -45,17 +45,17 @@ elif [ -r /etc/init.d/functions ]; then 22@@ -45,17 +45,17 @@ elif [ -r /etc/init.d/functions ]; then
@@ -39,4 +40,3 @@ index ea10b11..aac9f83 100644
39 echo 40 echo
40 ;; 41 ;;
41 *) 42 *)
42
diff --git a/meta-networking/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch b/meta-networking/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch
index 858adc50a8..f14626a38d 100644
--- a/meta-networking/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch
+++ b/meta-networking/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch
@@ -1,4 +1,4 @@
1From a6ffa3939a3ab2ad6a8d277cd8292b7dad6469c6 Mon Sep 17 00:00:00 2001 1From c76e727433ed895c605f9e7a3612bbc16ff558de Mon Sep 17 00:00:00 2001
2From: Aws Ismail <aws.ismail@windriver.com> 2From: Aws Ismail <aws.ismail@windriver.com>
3Date: Thu, 7 Jun 2012 12:28:34 -0400 3Date: Thu, 7 Jun 2012 12:28:34 -0400
4Subject: [PATCH] Do not build openipmigui man page 4Subject: [PATCH] Do not build openipmigui man page
@@ -11,6 +11,7 @@ Upstream-Status: Pending
11 11
12Signed-off-by: Aws Ismail <aws.ismail@windriver.com> 12Signed-off-by: Aws Ismail <aws.ismail@windriver.com>
13Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 13Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
14
14--- 15---
15 man/Makefile.am | 2 +- 16 man/Makefile.am | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-) 17 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch b/meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch
deleted file mode 100644
index 1aea32eaec..0000000000
--- a/meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1From 5a4abf223d79d4e1a58bbad1e4f2f406c7cab748 Mon Sep 17 00:00:00 2001
2From: Jackie Huang <jackie.huang@windriver.com>
3Date: Mon, 29 Dec 2014 18:16:04 +0800
4Subject: [PATCH] remove host path from la_LDFLAGS
5
6Upstream-Status: Inappropriate [ cross compile specific ]
7
8Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
9---
10 cmdlang/Makefile.am | 2 +-
11 unix/Makefile.am | 4 ++--
12 2 files changed, 3 insertions(+), 3 deletions(-)
13
14diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am
15index 9cf180d..da46ceb 100644
16--- a/cmdlang/Makefile.am
17+++ b/cmdlang/Makefile.am
18@@ -18,7 +18,7 @@ libOpenIPMIcmdlang_la_LIBADD = -lm \
19 $(top_builddir)/utils/libOpenIPMIutils.la \
20 $(top_builddir)/lib/libOpenIPMI.la
21 libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
22- -L$(libdir) -no-undefined
23+ -no-undefined
24
25 bin_PROGRAMS = openipmish
26
27diff --git a/unix/Makefile.am b/unix/Makefile.am
28index baf0815..80c3d5d 100644
29--- a/unix/Makefile.am
30+++ b/unix/Makefile.am
31@@ -11,13 +11,13 @@ libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c
32 libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \
33 $(top_builddir)/utils/libOpenIPMIutils.la $(RT_LIB)
34 libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
35- -L$(libdir) -no-undefined
36+ -no-undefined
37
38 libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c
39 libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \
40 $(GDBM_LIB) $(RT_LIB)
41 libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
42- -L$(libdir) -no-undefined
43+ -no-undefined
44
45 noinst_HEADERS = heap.h
46
47--
482.17.1
49
diff --git a/meta-networking/recipes-support/openipmi/openipmi_2.0.32.bb b/meta-networking/recipes-support/openipmi/openipmi_2.0.34.bb
index 18f4deca16..470ce1e254 100644
--- a/meta-networking/recipes-support/openipmi/openipmi_2.0.32.bb
+++ b/meta-networking/recipes-support/openipmi/openipmi_2.0.34.bb
@@ -26,27 +26,22 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
26SRC_URI = "${SOURCEFORGE_MIRROR}/openipmi/OpenIPMI-${PV}.tar.gz \ 26SRC_URI = "${SOURCEFORGE_MIRROR}/openipmi/OpenIPMI-${PV}.tar.gz \
27 file://fix-symlink-install-error-in-cmdlang.patch \ 27 file://fix-symlink-install-error-in-cmdlang.patch \
28 file://openipmi-no-openipmigui-man.patch \ 28 file://openipmi-no-openipmigui-man.patch \
29 file://openipmi-remove-host-path-from-la_LDFLAGS.patch \
30 file://ipmi-init-fix-the-arguments.patch \ 29 file://ipmi-init-fix-the-arguments.patch \
31 file://include_sys_types.patch \ 30 file://include_sys_types.patch \
32 file://openipmi-helper \ 31 file://openipmi-helper \
33 file://ipmi.service \ 32 file://ipmi.service \
34 file://0001-m4-ax_python_devel.m4-do-not-check-for-distutils.patch \
35 " 33 "
36 34
37S = "${WORKDIR}/OpenIPMI-${PV}" 35S = "${WORKDIR}/OpenIPMI-${PV}"
38 36
39SRC_URI[md5sum] = "532404c9df7d0e8bde975b95b9e6775b" 37SRC_URI[sha256sum] = "93227e43c72b5c3bd5949323e0669aa5527d1a971473a3a365af03fb8284a95f"
40SRC_URI[sha256sum] = "f6d0fd4c0a74b05f80907229d0b270f54ca23294bcc11979f8b8d12766786945"
41 38
42inherit autotools-brokensep pkgconfig python3native perlnative update-rc.d systemd cpan-base python3targetconfig 39inherit autotools-brokensep pkgconfig perlnative update-rc.d systemd cpan-base python3targetconfig
43 40
44CFLAGS += "-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" 41CFLAGS += "-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
45 42
46EXTRA_OECONF = "--disable-static \ 43EXTRA_OECONF = "--disable-static \
47 --with-perl='${STAGING_BINDIR_NATIVE}/perl-native/perl' \ 44 --with-perl='${STAGING_BINDIR_NATIVE}/perl-native/perl' \
48 --with-python='${STAGING_BINDIR_NATIVE}/python3-native/python3' \
49 --with-pythoninstall='${PYTHON_SITEPACKAGES_DIR}' \
50 --with-glibver=2.0" 45 --with-glibver=2.0"
51 46
52PACKAGECONFIG ??= "gdbm" 47PACKAGECONFIG ??= "gdbm"
@@ -68,9 +63,8 @@ FILES:${PN}-dbg += " \
68 " 63 "
69 64
70do_configure () { 65do_configure () {
71
72 # Let's perform regular configuration first then handle perl issues. 66 # Let's perform regular configuration first then handle perl issues.
73 autotools_do_configure 67 PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} autotools_do_configure
74 68
75 perl_ver=`perl -V:version | cut -d\' -f 2` 69 perl_ver=`perl -V:version | cut -d\' -f 2`
76 70
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-06-05 15:44:57 +0000