| Message ID | 20250313-upgrade-kmod-v2-2-2103ca9a26ad@gmail.com |
|---|---|
| State | Accepted, archived |
| Commit | a57fa257b4e64a790ee649661c0a386803acf0a5 |
| Headers | show |
| Series | Upgrade kmod 33 -> 34.1 | expand |
On 13 Mar 2025, at 08:58, Alex Kiernan via lists.openembedded.org <alex.kiernan=gmail.com@lists.openembedded.org> wrote: > inherit autotools-brokensep As this recipe doesn’t actually use autotools, this is just misleading. Please emove this inherit and just implement do_install instead: do_install() { oe_runmake 'DESTDIR=${D}' install } > +PV .= "+git” This is only needed if the SHA doesn’t match up with a release, and your patch clearly states “upgrade to 1.11.3”. But in git: commit 0528bcb993cac6c412acd3ae2e09539e994c0a59 (tag: 1.11.3) commit 29306d8dde650f5ac2bcc067f3c1d3bcfcac7a1d (HEAD -> master, origin/master, origin/HEAD) If we’re adding a git snapshot of effectively an arbitrary git commit (just the current master), please make that obvious. I’d prefer to stick with a release and apply patches unless there’s a good reason to use arbitrary commits (like, there would be tens of patches). >HOMEPAGE = "https://github.com/ddevault/scdoc" >BUGTRACKER = "https://github.com/ddevault/scdoc/issues" Both of these are wrong now that the repository isn’t on github anymore, please update. > +RECIPE_MAINTAINER:pn-scdoc = "Unassigned <unassigned@yoctoproject.org>” If you’re adding it, please consider being the maintainer. It’s a trivial tool so the burden shouldn't be too much effort. Ross
On Thu, Mar 13, 2025 at 12:26 PM Ross Burton <Ross.Burton@arm.com> wrote: > > On 13 Mar 2025, at 08:58, Alex Kiernan via lists.openembedded.org <alex.kiernan=gmail.com@lists.openembedded.org> wrote: > > inherit autotools-brokensep > > As this recipe doesn’t actually use autotools, this is just misleading. > > Please emove this inherit and just implement do_install instead: > > do_install() { > oe_runmake 'DESTDIR=${D}' install > } > ok > > +PV .= "+git” > > This is only needed if the SHA doesn’t match up with a release, and your patch clearly states “upgrade to 1.11.3”. But in git: > > commit 0528bcb993cac6c412acd3ae2e09539e994c0a59 (tag: 1.11.3) > commit 29306d8dde650f5ac2bcc067f3c1d3bcfcac7a1d (HEAD -> master, origin/master, origin/HEAD) > > If we’re adding a git snapshot of effectively an arbitrary git commit (just the current master), please make that obvious. I’d prefer to stick with a release and apply patches unless there’s a good reason to use arbitrary commits (like, there would be tens of patches). > I'll pick out the patch which use that in place of the local one so it clearly gets dropped next update - the others commits look minor > >HOMEPAGE = "https://github.com/ddevault/scdoc" > >BUGTRACKER = "https://github.com/ddevault/scdoc/issues" > > Both of these are wrong now that the repository isn’t on github anymore, please update. > okay > > +RECIPE_MAINTAINER:pn-scdoc = "Unassigned <unassigned@yoctoproject.org>” > > If you’re adding it, please consider being the maintainer. It’s a trivial tool so the burden shouldn't be too much effort. > Huh, I really thought I did that, but clearly didn't.
diff --git a/meta/recipes-extended/scdoc/scdoc/0001-Makefile-dont-add-static-to-LDFLAGS.patch b/meta/recipes-extended/scdoc/scdoc/0001-Makefile-dont-add-static-to-LDFLAGS.patch deleted file mode 100644 index b520e949c0b31c0908118cba4f6c2b6ea26f5a26..0000000000000000000000000000000000000000 --- a/meta/recipes-extended/scdoc/scdoc/0001-Makefile-dont-add-static-to-LDFLAGS.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2cac433806d9622dbc005fe5738f1ae8c33a98cb Mon Sep 17 00:00:00 2001 -From: Markus Volk <f_l_k@t-online.de> -Date: Thu, 13 Jul 2023 19:26:40 +0200 -Subject: [PATCH] Makefile: dont add -static to LDFLAGS - -Signed-off-by: Markus Volk <f_l_k@t-online.de> - -Upstream-Status: Inappropriate [oe-specific] ---- - Makefile | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 60a80b8..49021fa 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,7 +1,6 @@ - VERSION=1.11.2 - CFLAGS?=-g - MAINFLAGS:=-DVERSION='"$(VERSION)"' -Wall -Wextra -Werror -Wno-unused-parameter --LDFLAGS+=-static - INCLUDE+=-Iinclude - PREFIX?=/usr/local - BINDIR?=$(PREFIX)/bin --- -2.39.3 - diff --git a/meta/recipes-extended/scdoc/scdoc_git.bb b/meta/recipes-extended/scdoc/scdoc_1.11.3.bb similarity index 54% rename from meta/recipes-extended/scdoc/scdoc_git.bb rename to meta/recipes-extended/scdoc/scdoc_1.11.3.bb index 224e5417342e9db820456ec54476a1e3cac0e4e4..330d4e426f6e552e37214fffea244659eb8e4dcf 100644 --- a/meta/recipes-extended/scdoc/scdoc_git.bb +++ b/meta/recipes-extended/scdoc/scdoc_1.11.3.bb @@ -5,21 +5,18 @@ SECTION = "base/doc" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=31752b4a8edd3fb9ddba1cb90fada74d" -SRC_URI = " \ - git://git.sr.ht/~sircmpwn/scdoc;protocol=https;branch=master \ - file://0001-Makefile-dont-add-static-to-LDFLAGS.patch \ -" - DEPENDS = "scdoc-native" -S = "${WORKDIR}/git" -PV = "1.11.2" -SRCREV = "afeda241f3f9b2c27e461f32d9c2a704ab82ef61" +PV .= "+git" -EXTRA_OEMAKE:class-native = "PREFIX=${prefix}" -EXTRA_OEMAKE:class-target = "PREFIX=${prefix} HOST_SCDOC=${STAGING_BINDIR_NATIVE}/scdoc" +SRC_URI = "git://git.sr.ht/~sircmpwn/scdoc;protocol=https;branch=master" +SRCREV = "29306d8dde650f5ac2bcc067f3c1d3bcfcac7a1d" + +S = "${WORKDIR}/git" inherit autotools-brokensep - -BBCLASSEXTEND = "native" +EXTRA_OEMAKE = "PREFIX=${prefix}" +EXTRA_OEMAKE:append:class-target = " HOST_SCDOC=${STAGING_BINDIR_NATIVE}/scdoc" + +BBCLASSEXTEND = "native"
Drop "dont add -static to LDFLAGS" patch as this is now upstream. Changes: Dimitry Andric (1): Fix clang 15 -Wstrict-prototypes warnings Drew DeVault (3): README.md: mention system packages Update version to 1.11.3 Makefile: drop -static Eli Schwartz (2): remove useless re-declarations of standard functions get rid of some unused includes Humm (3): use .PP for paragraph breaks scdoc(1), scdoc(5): follow conventions more closely simplify list output Kirill Chibisov (1): Emit \(ti and \(ha instead of ~ and ^ Max Schillinger (1): fix formatting of escaped backticks Nico Wagner (1): Makefile: remove unnecessary path separator Simon Branch (2): scdoc.5: fix capitalization of subsection headers scdoc.5: fix formatting in the preamble Simon Ser (1): man: add section about SOURCE_DATE_EPOCH Viacheslav Kruglov (1): Fix logical error in comparison with ULONG_MAX elij (1): strip indentation after a hard line break `++` jturtle (1): Emit '\e' instead of '\\' Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> --- .../0001-Makefile-dont-add-static-to-LDFLAGS.patch | 27 ---------------------- .../scdoc/{scdoc_git.bb => scdoc_1.11.3.bb} | 21 ++++++++--------- 2 files changed, 9 insertions(+), 39 deletions(-)