Message ID | 20250319174152.706861-12-ross.burton@arm.com |
---|---|
State | Accepted |
Headers | show |
Series | [v2,01/12] rdisk: don't inherit autotools | expand |
On Wed, Mar 19, 2025 at 10:42 AM Ross Burton via lists.openembedded.org <ross.burton=arm.com@lists.openembedded.org> wrote: > > This upstream does not in fact use autotools, so remove the inherit and > implement the required do_install. > > Also fix the hardcoded /usr/bin to use ${bindir}. > > Signed-off-by: Ross Burton <ross.burton@arm.com> > --- > meta-oe/recipes-graphics/fbgrab/fbgrab_1.5.bb | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/meta-oe/recipes-graphics/fbgrab/fbgrab_1.5.bb b/meta-oe/recipes-graphics/fbgrab/fbgrab_1.5.bb > index 7b52ead909..efcf5a9ea6 100644 > --- a/meta-oe/recipes-graphics/fbgrab/fbgrab_1.5.bb > +++ b/meta-oe/recipes-graphics/fbgrab/fbgrab_1.5.bb > @@ -9,8 +9,13 @@ SRC_URI = "git://github.com/GunnarMonell/fbgrab.git;protocol=https;branch=master > SRCREV = "f43ce6d5ce48fb01360eaa7c4a92c2573a1d02f8" > S = "${WORKDIR}/git" > > -inherit autotools-brokensep > - > do_configure:prepend() { should this prepend to do_configure still ? > - sed -i 's|$(DESTDIR)/usr/man/|$(DESTDIR)${mandir}/|g' ${S}/Makefile > + sed \ > + -e 's|$(DESTDIR)/usr/bin/|$(DESTDIR)${bindir}/|g' \ > + -e 's|$(DESTDIR)/usr/man/|$(DESTDIR)${mandir}/|g' \ > + -i ${S}/Makefile > +} > + > +do_install() { > + oe_runmake 'DESTDIR=${D}' install > } > -- > 2.43.0 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#116097): https://lists.openembedded.org/g/openembedded-devel/message/116097 > Mute This Topic: https://lists.openembedded.org/mt/111794448/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta-oe/recipes-graphics/fbgrab/fbgrab_1.5.bb b/meta-oe/recipes-graphics/fbgrab/fbgrab_1.5.bb index 7b52ead909..efcf5a9ea6 100644 --- a/meta-oe/recipes-graphics/fbgrab/fbgrab_1.5.bb +++ b/meta-oe/recipes-graphics/fbgrab/fbgrab_1.5.bb @@ -9,8 +9,13 @@ SRC_URI = "git://github.com/GunnarMonell/fbgrab.git;protocol=https;branch=master SRCREV = "f43ce6d5ce48fb01360eaa7c4a92c2573a1d02f8" S = "${WORKDIR}/git" -inherit autotools-brokensep - do_configure:prepend() { - sed -i 's|$(DESTDIR)/usr/man/|$(DESTDIR)${mandir}/|g' ${S}/Makefile + sed \ + -e 's|$(DESTDIR)/usr/bin/|$(DESTDIR)${bindir}/|g' \ + -e 's|$(DESTDIR)/usr/man/|$(DESTDIR)${mandir}/|g' \ + -i ${S}/Makefile +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install }
This upstream does not in fact use autotools, so remove the inherit and implement the required do_install. Also fix the hardcoded /usr/bin to use ${bindir}. Signed-off-by: Ross Burton <ross.burton@arm.com> --- meta-oe/recipes-graphics/fbgrab/fbgrab_1.5.bb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)