packagegroup-meta-filesystems: Update to add new recipes
PATCH 1/5 packagegroup-meta-filesystems: Update to add new recipes
Re-format while here to list one entry per line
Signed-off-by Khem Raj <[email protected]>
--- .../packagegroup-meta-filesystems.bb | 34 ++++++++++++++----- 1 file changed, 25 insertions(+), 9 deletions(-)
meta-filesystems/recipes-filesystems/packageconfigs/packagegroup-meta-filesystems.bb +25 -9
@@ -16,20 +16,36 @@ RDEPENDS_packagegroup-meta-filesystems = "\ " RDEPENDS_packagegroup-meta-filesystems = "\ - ntfs-3g-ntfsprogs ifuse sshfs-fuse \ - logfsprogs owfs simple-mtpfs \ - unionfs-fuse fuse-exfat yaffs2-utils \ + ifuse \ + logfsprogs \ + fuse-exfat \ + owfs \ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "smbnetfs", "", d)} \ - " + simple-mtpfs \ + yaffs2-utils \ + ntfs-3g-ntfsprogs \ + httpfs2 \ + unionfs-fuse \ + sshfs-fuse \ +" RDEPENDS_packagegroup-meta-filesystems-support = "\ - physfs fuse \ - " + fuse3 \ + fuse \ + physfs \ +" RDEPENDS_packagegroup-meta-filesystems-utils = "\ - xorriso aufs-util xfsprogs \ - f2fs-tools exfat-utils udevil \ + aufs-util \ + exfat-utils \ + fatcat \ xfsdump \ - " + f2fs-tools \ + fatresize \ + udevil \ + ufs-utils \ + xfsprogs \ + xorriso \ +" EXCLUDE_FROM_WORLD = "1"
Signature · 1 line
2.28.0
PATCH 2/5 packagegroup-meta-webserver: Update to include new recipes
Re-organise to have one entry per line
Signed-off-by Khem Raj <[email protected]>
--- .../packagegroup-meta-webserver.bb | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-)
meta-webserver/recipes-core/packagesgroups/packagegroup-meta-webserver.bb +20 -9
@@ -19,20 +19,31 @@ RDEPENDS_packagegroup-meta-webserver = "\ " RDEPENDS_packagegroup-meta-webserver-http = "\ - nginx monkey hiawatha nostromo apache-websocket \ - apache2 sthttpd \ + apache-websocket \ + apache2 \ ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "cherokee", "", d)} \ - " + hiawatha \ + monkey \ + nginx \ + nginx \ + nostromo \ + sthttpd \ +" RDEPENDS_packagegroup-meta-webserver-php = "\ - phpmyadmin xdebug \ - " + phpmyadmin \ + xdebug \ +" RDEPENDS_packagegroup-meta-webserver-support = "\ - spawn-fcgi fcgi \ - " + spawn-fcgi \ + fcgi \ +" RDEPENDS_packagegroup-meta-webserver-webadmin = "\ - netdata webmin \ - " + cockpit \ + webmin \ + netdata \ +" + EXCLUDE_FROM_WORLD = "1"
Signature · 1 line
2.28.0
PATCH 3/5 monkey: Remove /var/run
In reply to Khem RajThis is empty and its a runtime directory which is created by base-files already
Signed-off-by Khem Raj <[email protected]>
--- meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb | 1 + 1 file changed, 1 insertion(+)
meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb +1 -0
@@ -39,6 +39,7 @@ OECMAKE_GENERATOR = "Unix Makefiles" do_install_append() { rm -rf ${D}/run + rm -rf ${D}${localstatedir}/run install -Dm 0755 ${WORKDIR}/monkey.init ${D}${sysconfdir}/init.d/monkey if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
Signature · 1 line
2.28.0
PATCH 4/5 monkey: Correct the install path in init services
In reply to Khem RajIts not in bindir but in sbindir
Signed-off-by Khem Raj <[email protected]>
--- meta-webserver/recipes-httpd/monkey/files/monkey.init | 2 +- meta-webserver/recipes-httpd/monkey/files/monkey.service | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
meta-webserver/recipes-httpd/monkey/files/monkey.init +1 -1
@@ -1,7 +1,7 @@ #!/bin/sh PATH=/sbin:/bin:/usr/sbin:/usr/bin -DAEMON=/usr/bin/monkey +DAEMON=/usr/sbin/monkey NAME=monkey DESC="Monkey HTTP Server" OPTS="--daemon"
meta-webserver/recipes-httpd/monkey/files/monkey.service +1 -1
@@ -4,7 +4,7 @@ After=network.target remote-fs.target [Service] Type=forking -ExecStart=/usr/bin/monkey --daemon +ExecStart=/usr/sbin/monkey --daemon PIDFile=/var/run/monkey.pid.2001 TimeoutSec=10
Signature · 1 line
2.28.0
PATCH 5/5 packagegroup-meta-oe: Exclude from world builds
In reply to Khem RajSigned-off-by Khem Raj <[email protected]>
--- meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 3 +++ 1 file changed, 3 insertions(+)
meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +3 -0
@@ -936,3 +936,6 @@ RDEPENDS_packagegroup-meta-oe-fortran-packages = "\ # spdlog span-lite uthash websocketpp catch2 properties-cpp # rsyslog conflicts with syslog-ng so its not included here + +EXCLUDE_FROM_WORLD = "1" +
Signature · 1 line
2.28.0