diff options
Diffstat (limited to 'recipes-dpaa2/restool')
3 files changed, 38 insertions, 33 deletions
diff --git a/recipes-dpaa2/restool/files/disable-manpage-generation.patch b/recipes-dpaa2/restool/files/disable-manpage-generation.patch new file mode 100644 index 00000000..34f2ae2d --- /dev/null +++ b/recipes-dpaa2/restool/files/disable-manpage-generation.patch @@ -0,0 +1,26 @@ +From 5392152e704ff001c41de03445d668227237a87e Mon Sep 17 00:00:00 2001 +From: Ting Liu <ting.liu@nxp.com> +Date: Fri, 15 Oct 2021 09:36:04 +0530 +Subject: [PATCH] disable manpage generation + +Upstream-Status: Inappropriate [Cross-compile specific] +Signed-off-by: Ting Liu <ting.liu@nxp.com> +--- + Makefile | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Makefile b/Makefile +index ee669ae..ab6e499 100644 +--- a/Makefile ++++ b/Makefile +@@ -60,7 +60,6 @@ install: restool scripts/ls-main scripts/ls-append-dpl scripts/ls-debug scripts/ + install -D -m 755 scripts/ls-debug $(DESTDIR)$(bindir)/ls-debug + $(foreach symlink, $(RESTOOL_SCRIPT_SYMLINKS), sh -c "cd $(DESTDIR)$(bindir) && ln -sf ls-main $(symlink)" ;) + install -D -m 755 scripts/restool_completion.sh $(DESTDIR)$(bindir_completion)/restool +- install -m 0644 -D $(MANPAGE) $(call get_manpage_destination,$(MANPAGE)) + + clean: + rm -f $(OBJ) $(MANPAGE) \ +-- +2.25.1 + diff --git a/recipes-dpaa2/restool/restool/0001-restool-fix-build-error-with-gcc7.patch b/recipes-dpaa2/restool/restool/0001-restool-fix-build-error-with-gcc7.patch deleted file mode 100644 index 82ade02b..00000000 --- a/recipes-dpaa2/restool/restool/0001-restool-fix-build-error-with-gcc7.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 895db76654c796a0edc6b2d329addde108b1755c Mon Sep 17 00:00:00 2001 -From: Chunrong Guo <chunrong.guo@nxp.com> -Date: Wed, 19 Jul 2017 14:31:23 +0800 -Subject: [PATCH] restool: fix build error with gcc7 - ---- - Makefile | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 3976b66..df1e791 100644 ---- a/Makefile -+++ b/Makefile -@@ -64,7 +64,6 @@ CFLAGS = ${EXTRA_CFLAGS} \ - -Wmissing-prototypes \ - -Wpointer-arith \ - -Winline \ -- -Werror \ - -Wundef \ - -Icommon/ - --- -2.7.4 - diff --git a/recipes-dpaa2/restool/restool_git.bb b/recipes-dpaa2/restool/restool_git.bb index 0211c779..1d1aeffe 100644 --- a/recipes-dpaa2/restool/restool_git.bb +++ b/recipes-dpaa2/restool/restool_git.bb @@ -1,17 +1,17 @@ SUMMARY = "DPAA2 Resource Manager Tool" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=ec8d84e9cd4de287e290275d09db27f0" +LICENSE = "BSD-3-Clause | GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ec8d84e9cd4de287e290275d09db27f0" -RDEPENDS_${PN} += "bash dtc" - -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/restool;nobranch=1 \ - file://0001-restool-fix-build-error-with-gcc7.patch" - -SRCREV = "f0cec094e4c6d1c975b377203a3bf994ba9325a9" +SRC_URI = "git://github.com/nxp-qoriq/restool;protocol=https;nobranch=1 \ + file://disable-manpage-generation.patch \ +" +SRCREV = "46604e41f4c7e54efa62503c6b4629321b21e056" S = "${WORKDIR}/git" -EXTRA_OEMAKE = 'CC="${CC}" EXTRA_CFLAGS="-Wno-missing-field-initializers -Wno-missing-braces"' +inherit bash-completion + +EXTRA_OEMAKE = 'CC="${CC}" MANPAGE= EXTRA_CFLAGS="-O2 -Wno-missing-field-initializers -Wno-missing-braces -Wno-maybe-uninitialized -Wno-date-time"' do_install () { oe_runmake install DESTDIR=${D} @@ -20,3 +20,6 @@ do_install () { COMPATIBLE_MACHINE = "(qoriq-arm64)" PACKAGE_ARCH = "${MACHINE_ARCH}" +RDEPENDS:${PN} += "bash dtc" +RDEPENDS:${PN}-bash-completion += "bash" + |