diff options
author | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2024-05-27 22:28:57 +0200 |
---|---|---|
committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2024-05-27 22:31:49 +0200 |
commit | 624c9f96ac09d9f2fcdb34b02188e14a276bb7ee (patch) | |
tree | 33f6312f111ee47dae1cf74d5da612f0c069479b | |
parent | c1c38eaa75539f4eff86ad144427fdbb155ab251 (diff) |
meta-agl-devel: remove meta-agl-wireless-monitor
Unused and unmaintained. Restore if you intent to maintain it.
Bug-AGL: SPEC-5151
Change-Id: I871192973167cc674e47867961a3525459aeeca8
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
17 files changed, 0 insertions, 374 deletions
diff --git a/meta-agl-wireless-monitor/README.md b/meta-agl-wireless-monitor/README.md deleted file mode 100644 index eb58c7b7..00000000 --- a/meta-agl-wireless-monitor/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# AGL wireless monitor layer - -This yocto layer adds the feature 'agl-wireless-monitor' - -'agl-wireless-monitor' is used to compile the main program, 3rd -party conponents such as boa and mjpeg-streamer. - -It is a RaspberryPi 4B platform specific demo, you also need reference -hardware to motivate such a demo. - diff --git a/meta-agl-wireless-monitor/conf/include/agl-wireless-monitor.inc b/meta-agl-wireless-monitor/conf/include/agl-wireless-monitor.inc deleted file mode 100644 index acf3ed60..00000000 --- a/meta-agl-wireless-monitor/conf/include/agl-wireless-monitor.inc +++ /dev/null @@ -1,2 +0,0 @@ -IMAGE_FEATURES += "agl-wireless-monitor" -FEATURE_PACKAGES_agl-wireless-monitor = "packagegroup-agl-wireless-monitor" diff --git a/meta-agl-wireless-monitor/conf/layer.conf b/meta-agl-wireless-monitor/conf/layer.conf deleted file mode 100644 index e21fa987..00000000 --- a/meta-agl-wireless-monitor/conf/layer.conf +++ /dev/null @@ -1,15 +0,0 @@ -#We have a conf and classes directory, add to BBPATH -BBPATH .= ":${LAYERDIR}" - -# We have recipes-* directories, add to BBFILES -BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend" - -BBFILE_COLLECTIONS += "agl-wireless-monitor" -BBFILE_PATTERN_agl-wireless-monitor = "^${LAYERDIR}/" -BBFILE_PRIORITY_agl-drm-lease = "100" - -# This should only be incremented on significant changes that will -# cause compatibility issues with other layers -LAYERVERSION_agl-wireless-monitor = "1" - -LAYERSERIES_COMPAT_agl-wireless-monitor = "scarthgap" diff --git a/meta-agl-wireless-monitor/recipes-component/boa/boa-0.94.13/0001-boa-fix-compat.h.patch b/meta-agl-wireless-monitor/recipes-component/boa/boa-0.94.13/0001-boa-fix-compat.h.patch deleted file mode 100644 index caa0e263..00000000 --- a/meta-agl-wireless-monitor/recipes-component/boa/boa-0.94.13/0001-boa-fix-compat.h.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 2d33bc14c1ed37bcc50973740e432d6d894141b6 Mon Sep 17 00:00:00 2023 -From: Yan <yanxk.fnst@fujitsu.com> -Date: Fri, 25 Aug 2023 10:03:15 +0800 -Subject: [PATCH] boa: fix compat.h - -fix this grammer mistake. - -Upstream-Status: Pending -Signed-off-by: Yan <yanxk.fnst@fujitsu.com> ---- - src/compat.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/compat.h b/src/compat.h -index b3be2e0..31b656a 100644 ---- a/src/compat.h -+++ b/src/compat.h -@@ -117,7 +117,7 @@ char *strdup(char *s); - #endif - - #ifdef HAVE_TM_GMTOFF --#define TIMEZONE_OFFSET(foo) foo##->tm_gmtoff -+#define TIMEZONE_OFFSET(foo) (foo)->tm_gmtoff - #else - #define TIMEZONE_OFFSET(foo) timezone - #endif --- -2.25.1 diff --git a/meta-agl-wireless-monitor/recipes-component/boa/boa-0.94.13/0001-boa-fix-configure-avoid-run-test-on-cross-platform.patch b/meta-agl-wireless-monitor/recipes-component/boa/boa-0.94.13/0001-boa-fix-configure-avoid-run-test-on-cross-platform.patch deleted file mode 100644 index b0afccce..00000000 --- a/meta-agl-wireless-monitor/recipes-component/boa/boa-0.94.13/0001-boa-fix-configure-avoid-run-test-on-cross-platform.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 88d73d77794cde03f93ed53f21a163f5980696be Mon Sep 17 00:00:00 2023 -From: Yan <yanxk.fnst@fujitsu.com> -Date: Fri, 25 Aug 2023 09:53:43 +0800 -Subject: [PATCH] boa: fix configure avoid run test on cross platform - -during configuration, boa configure would run already -cross compiled test files on host machine, remove exit -is to ignore this run test failure. - -Upstream-Status: Pending -Signed-off-by: Yan <yanxk.fnst@fujitsu.com> ---- - src/configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/configure b/src/configure -index bda829f..7a6a624 100755 ---- a/src/configure -+++ b/src/configure -@@ -1552,7 +1552,7 @@ if eval "test \"`echo '$''{'ac_cv_func_setvbuf_reversed'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - if test "$cross_compiling" = yes; then -- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } -+ { echo "configure: error: can not run test program while cross compiling" 1>&2; } - else - cat > conftest.$ac_ext <<EOF - #line 1559 "configure" --- -2.25.1 diff --git a/meta-agl-wireless-monitor/recipes-component/boa/boa-0.94.13/0001-boa-fix-icky-kernel-bug.patch b/meta-agl-wireless-monitor/recipes-component/boa/boa-0.94.13/0001-boa-fix-icky-kernel-bug.patch deleted file mode 100644 index f1039547..00000000 --- a/meta-agl-wireless-monitor/recipes-component/boa/boa-0.94.13/0001-boa-fix-icky-kernel-bug.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 238e0f78c950a940544049cafec63f26c8722250 Mon Sep 17 00:00:00 2023 -From: Yan <yanxk.fnst@fujitsu.com> -Date: Fri, 25 Aug 2023 09:59:38 +0800 -Subject: [PATCH] boa: fix icky kernel bug - -Upstream-Status: Pending -comment out these DIE sentecnce to avoid crash -when you start the boa server. - -Signed-off-by: Yan <yanxk.fnst@fujitsu.com> ---- - src/boa.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/boa.c b/src/boa.c -index 8ce2c7b..b2f3f83 100644 ---- a/src/boa.c -+++ b/src/boa.c -@@ -222,9 +222,11 @@ static void drop_privs(void) - /* test for failed-but-return-was-successful setuid - * http://www.securityportal.com/list-archive/bugtraq/2000/Jun/0101.html - */ -+ #if 0 - if (setuid(0) != -1) { - DIE("icky Linux kernel bug!"); - } -+ #endif - } else { - if (server_gid || server_uid) { - log_error_time(); --- -2.25.1 diff --git a/meta-agl-wireless-monitor/recipes-component/boa/boa-0.94.13/0001-boa-modify-conf-file-matching-AGL-system.patch b/meta-agl-wireless-monitor/recipes-component/boa/boa-0.94.13/0001-boa-modify-conf-file-matching-AGL-system.patch deleted file mode 100644 index 52f32eb8..00000000 --- a/meta-agl-wireless-monitor/recipes-component/boa/boa-0.94.13/0001-boa-modify-conf-file-matching-AGL-system.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 6b227adac5dbabc958ef215f15637d3c4d21d759 Mon Sep 17 00:00:00 2001 -From: Yan <yanxk.fnst@fujitsu.com> -Date: Sat, 7 Oct 2023 18:27:42 +0800 -Subject: [PATCH] boa: modify conf file matching AGL system - -set boa and boa_index working path to /usr/bin -error log and access log are re-directed to /var/log/ -default index reset to homepage -cgi-bin folder to /usr/bin/cgi-bin - -Upstream-Status: Pending -Signed-off-by: Yan <yanxk.fnst@fujitsu.com> ---- - boa.conf | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/boa.conf b/boa.conf -index e3775db..4da9983 100644 ---- a/boa.conf -+++ b/boa.conf -@@ -59,7 +59,7 @@ Group nogroup - # Set to /dev/null if you don't want errors logged. - # If unset, defaults to /dev/stderr - --ErrorLog /var/log/boa/error_log -+ErrorLog /var/log/boa_error_log - # Please NOTE: Sending the logs to a pipe ('|'), as shown below, - # is somewhat experimental and might fail under heavy load. - # "Usual libc implementations of printf will stall the whole -@@ -71,7 +71,7 @@ ErrorLog /var/log/boa/error_log - # Comment out or set to /dev/null (less effective) to disable - # Access logging. - --AccessLog /var/log/boa/access_log -+AccessLog /var/log/boa_access_log - # Please NOTE: Sending the logs to a pipe ('|'), as shown below, - # is somewhat experimental and might fail under heavy load. - # "Usual libc implementations of printf will stall the whole -@@ -108,7 +108,7 @@ AccessLog /var/log/boa/access_log - # DocumentRoot: The root directory of the HTML documents. - # Comment out to disable server non user files. - --DocumentRoot /var/www -+DocumentRoot /etc/boa/www - - # UserDir: The name of the directory which is appended onto a user's home - # directory if a ~user request is recieved. -@@ -120,14 +120,14 @@ UserDir public_html - # fly creation of directory indexes can be _slow_. - # Comment out to always use DirectoryMaker - --DirectoryIndex index.html -+DirectoryIndex homepage.html - - # DirectoryMaker: Name of program used to create a directory listing. - # Comment out to disable directory listings. If both this and - # DirectoryIndex are commented out, accessing a directory will give - # an error (though accessing files in the directory are still ok). - --DirectoryMaker /usr/lib/boa/boa_indexer -+DirectoryMaker /usr/bin/boa_indexer - - # DirectoryCache: If DirectoryIndex doesn't exist, and DirectoryMaker - # has been commented out, the the on-the-fly indexing of Boa can be used -@@ -190,5 +190,5 @@ Alias /doc /usr/doc - # ScriptAlias: Maps a virtual path to a directory for serving scripts - # Example: ScriptAlias /htbin/ /www/htbin/ - --ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/ -+ScriptAlias /cgi-bin/ /usr/bin/cgi-bin/ - --- -2.25.1 - diff --git a/meta-agl-wireless-monitor/recipes-component/boa/boa_0.94.13.bb b/meta-agl-wireless-monitor/recipes-component/boa/boa_0.94.13.bb deleted file mode 100644 index fbdc799c..00000000 --- a/meta-agl-wireless-monitor/recipes-component/boa/boa_0.94.13.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "Boa Web Server" -HOMEPAGE = "http://www.boa.org/" -DESCRIPTION = "Boa web server is a tiny web server." - -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://Gnu_License;md5=94d55d512a9ba36caa9b7df079bae19f" - -DEPENDS = "bison-native flex-native" - -SRC_URI = "http://www.boa.org/boa-0.94.13.tar.gz \ - file://0001-boa-fix-compat.h.patch \ - file://0001-boa-fix-configure-avoid-run-test-on-cross-platform.patch \ - file://0001-boa-fix-icky-kernel-bug.patch \ - file://0001-boa-modify-conf-file-matching-AGL-system.patch \ -" - -SRC_URI[sha256sum] = "e00bb50eb859c736f2afc913976e82e8fc68a1fbe34fa294e014aa95f4d87366" - -do_configure() { - cd ${S}/src - ./configure - sed -i '/^CC =/ s/$/& -fcommon/' Makefile -} - -do_compile() { - cd ${S}/src - oe_runmake -} - -do_install() { - install -d ${D}/usr/bin/ - install -m 0755 ${S}/src/boa ${D}/usr/bin/ - install -m 0755 ${S}/src/boa_indexer ${D}/usr/bin/ - install -d ${D}/etc/boa/ - install -m 0755 ${S}/boa.conf ${D}/etc/boa/ -} - -RDEPENDS:${PN} += "mime-support" diff --git a/meta-agl-wireless-monitor/recipes-component/libcgic/files/0001-modify-makefile-for-cross-build.patch b/meta-agl-wireless-monitor/recipes-component/libcgic/files/0001-modify-makefile-for-cross-build.patch deleted file mode 100644 index a88d69da..00000000 --- a/meta-agl-wireless-monitor/recipes-component/libcgic/files/0001-modify-makefile-for-cross-build.patch +++ /dev/null @@ -1,47 +0,0 @@ -From b1ad0a4560ff3fecc45bf54c64688ffa6a43c714 Mon Sep 17 00:00:00 2001 -From: Yan <yanxk.fnst@fujitsu.com> -Date: Fri, 6 Oct 2023 14:03:50 +0800 -Subject: [PATCH] modify makefile for cross build - -remove static cc ar ranlib -add cflag and ldflag to build command - -Upstream Status: Pending -Signed-off-by: Yan <yanxk.fnst@fujitsu.com> ---- - Makefile | 9 +++------ - 1 file changed, 3 insertions(+), 6 deletions(-) - -diff --git a/Makefile b/Makefile -index 8be64c3..4659342 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,7 +1,4 @@ - CFLAGS=-g -Wall --CC=gcc --AR=ar --RANLIB=ranlib - LIBS=-L./ -lcgic - - all: libcgic.a cgictest.cgi capture -@@ -19,14 +16,14 @@ libcgic.a: cgic.o cgic.h - #mingw32 and cygwin users: replace .cgi with .exe - - cgictest.cgi: cgictest.o libcgic.a -- gcc cgictest.o -o cgictest.cgi ${LIBS} -+ $(CC) $(CFLAGS) $(LDFLAGS) cgictest.o -o cgictest.cgi ${LIBS} - - capture: capture.o libcgic.a -- gcc capture.o -o capture ${LIBS} -+ $(CC) $(CFLAGS) $(LDFLAGS) capture.o -o capture ${LIBS} - - clean: - rm -f *.o *.a cgictest.cgi capture cgicunittest - - test: -- gcc -D UNIT_TEST=1 cgic.c -o cgicunittest -+ $(CC) -D UNIT_TEST=1 cgic.c -o cgicunittest - ./cgicunittest --- -2.25.1 - diff --git a/meta-agl-wireless-monitor/recipes-component/libcgic/libcgic_2.0.8.bb b/meta-agl-wireless-monitor/recipes-component/libcgic/libcgic_2.0.8.bb deleted file mode 100644 index 7b470ef0..00000000 --- a/meta-agl-wireless-monitor/recipes-component/libcgic/libcgic_2.0.8.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "CGIC library" -HOMEPAGE = "https://github.com/boutell/cgic" -DESCRIPTION = "An ANSI C library for CGI Programming." - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://license.txt;md5=1ef0cf0c9e6e61f326fd48746179cf38" - -SRCREV = "a3490b7612f194f029b6e7a7fc602ad962bc33e2" - -S = "${WORKDIR}/git" - -SRC_URI = "git://github.com/boutell/cgic.git;protocol=https;branch=master \ - file://0001-modify-makefile-for-cross-build.patch \ -" - -EXTRA_OEMAKE = "LDFLAGS='${LDFLAGS}'" - -do_install() { - install -d ${D}/usr/bin/cgi-bin - install -m 0755 ${S}/capture ${D}/usr/bin/cgi-bin - install -m 0755 ${S}/cgictest.cgi ${D}/usr/bin/cgi-bin -} diff --git a/meta-agl-wireless-monitor/recipes-component/mjpg_streamer/mjpg-streamer.bb b/meta-agl-wireless-monitor/recipes-component/mjpg_streamer/mjpg-streamer.bb deleted file mode 100644 index 6c3685b6..00000000 --- a/meta-agl-wireless-monitor/recipes-component/mjpg_streamer/mjpg-streamer.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "Motion JPEG streamer but modified for AGL system." -HOMEPAGE = "http://sourceforge.net/projects/mjpg-streamer/" -DESCRIPTION = "Motion JPEG streamer is a video streamer specially designed for Web Cameras." - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://${S}/mjpg-streamer/LICENSE;md5=751419260aa954499f7abaabaa882bbe" - -PN = "mjpg-streamer" - -SRC_URI = "git://github.com/lucky33newman/Motion-JPEG-for-AGL.git;branch=main;protocol=https" - -SRCREV = "09185f3d55b7c4de6d196d2ad5c5b4eadc4f340a" - -S = "${WORKDIR}/git" - -DEPENDS = "libjpeg-turbo" -RDEPENDS:${PN} += "libjpeg-turbo" - -EXTRA_OEMAKE = "LDFLAGS='${LDFLAGS}'" - -do_compile() { - oe_runmake -C ${S}/mjpg-streamer -} - -do_install() { - install -d ${D}/usr/bin/ - install -m 0755 ${S}/mjpg-streamer/mjpg_streamer ${D}/usr/bin/ - install -d ${D}/usr/lib/mjpg-streamer - install -m 0755 ${S}/mjpg-streamer/*.so ${D}/usr/lib/mjpg-streamer/ - install -d ${D}/etc/MJPG-streamer/www/ - install -m 0755 ${S}/mjpg-streamer/www/* ${D}/etc/MJPG-streamer/www/ -} diff --git a/meta-agl-wireless-monitor/recipes-core/incar-wireless-monitor/incar-wireless-monitor.bb b/meta-agl-wireless-monitor/recipes-core/incar-wireless-monitor/incar-wireless-monitor.bb deleted file mode 100644 index db8582c1..00000000 --- a/meta-agl-wireless-monitor/recipes-core/incar-wireless-monitor/incar-wireless-monitor.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "An in-car wireless monitor demo." -HOMEPAGE = "https://git.automotivelinux.org/staging/incar-wireless-monitor/" -LICENSE = "Apache-2.0" - -S = "${WORKDIR}/git" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -PN = 'incar-wireless-monitor' -PV = '1' - -SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/incar-wireless-monitor;protocol=https;branch=${AGL_BRANCH}" -SRCREV = "927829c95bac0874b07b0aaee1663f42f5e59530" - -RDEPENDS:${PN} += "boa" -RDEPENDS:${PN} += "mjpg-streamer" -RDEPENDS:${PN} += "libcgic" - -do_install() { - install -d ${D}/etc/boa/www/ - install -m 0755 ${WORKDIR}/git/ui/www/*.html ${D}/etc/boa/www/ -} diff --git a/meta-agl-wireless-monitor/recipes-kernel/linux/files/ch341.cfg b/meta-agl-wireless-monitor/recipes-kernel/linux/files/ch341.cfg deleted file mode 100644 index 02e6f957..00000000 --- a/meta-agl-wireless-monitor/recipes-kernel/linux/files/ch341.cfg +++ /dev/null @@ -1 +0,0 @@ -CONFIG_USB_SERIAL_CH341=y diff --git a/meta-agl-wireless-monitor/recipes-kernel/linux/linux-raspberrypi_5.15.bbappend b/meta-agl-wireless-monitor/recipes-kernel/linux/linux-raspberrypi_5.15.bbappend deleted file mode 100644 index 95287c66..00000000 --- a/meta-agl-wireless-monitor/recipes-kernel/linux/linux-raspberrypi_5.15.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" - -SRC_URI += " \ - file://ch341.cfg \ - " diff --git a/meta-agl-wireless-monitor/recipes-platform/packagegroup/packagegroup-agl-wireless-monitor.bb b/meta-agl-wireless-monitor/recipes-platform/packagegroup/packagegroup-agl-wireless-monitor.bb deleted file mode 100644 index 5a3c5dd7..00000000 --- a/meta-agl-wireless-monitor/recipes-platform/packagegroup/packagegroup-agl-wireless-monitor.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "AGL Wireless Monitor Group" -LICENSE = "Apache-2.0" - -inherit packagegroup - -PACKAGES = "\ - packagegroup-agl-wireless-monitor \ -" - -RDEPENDS:${PN} += " \ - incar-wireless-monitor \ -" diff --git a/templates/feature/agl-wireless-monitor/50_bblayers.conf.inc b/templates/feature/agl-wireless-monitor/50_bblayers.conf.inc deleted file mode 100644 index 275ad160..00000000 --- a/templates/feature/agl-wireless-monitor/50_bblayers.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -BBLAYERS =+ " \ - ${METADIR}/meta-agl-devel/meta-agl-wireless-monitor \ -" diff --git a/templates/feature/agl-wireless-monitor/50_local.conf.inc b/templates/feature/agl-wireless-monitor/50_local.conf.inc deleted file mode 100644 index 748047f0..00000000 --- a/templates/feature/agl-wireless-monitor/50_local.conf.inc +++ /dev/null @@ -1 +0,0 @@ -require conf/include/agl-wireless-monitor.inc |