diff mbox series

[meta-webserver] cockpit: Upgrade to 337

Message ID 20250509060628.1082632-1-raj.khem@gmail.com
State New
Headers show
Series [meta-webserver] cockpit: Upgrade to 337 | expand

Commit Message

Khem Raj May 9, 2025, 6:06 a.m. UTC
Get rid of remoeved configure options

ERROR: QA Issue: cockpit: configure was passed unrecognised options: --disable-pcp --enable-old-bridge --with-cockpit-ws-instance-user --disable-ssh --disable-polkit --with-cockpit-ws-instance-group --with-cockpit-group --with-cockpit-user [unknown-configure-option]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../{cockpit_304.bb => cockpit_337.bb}        | 40 ++++++++++---------
 1 file changed, 22 insertions(+), 18 deletions(-)
 rename meta-webserver/recipes-webadmin/cockpit/{cockpit_304.bb => cockpit_337.bb} (82%)

Comments

Gyorgy Sarvari May 9, 2025, 6:44 a.m. UTC | #1
On 5/9/25 08:06, Khem Raj via lists.openembedded.org wrote:
> Get rid of remoeved configure options
>
> ERROR: QA Issue: cockpit: configure was passed unrecognised options: --disable-pcp --enable-old-bridge --with-cockpit-ws-instance-user --disable-ssh --disable-polkit --with-cockpit-ws-instance-group --with-cockpit-group --with-cockpit-user [unknown-configure-option]
I believe with this also the COCKPIT_WS_USER_GROUP variable became
orphan and could be removed as part of the cleanup
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../{cockpit_304.bb => cockpit_337.bb}        | 40 ++++++++++---------
>  1 file changed, 22 insertions(+), 18 deletions(-)
>  rename meta-webserver/recipes-webadmin/cockpit/{cockpit_304.bb => cockpit_337.bb} (82%)
>
> diff --git a/meta-webserver/recipes-webadmin/cockpit/cockpit_304.bb b/meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb
> similarity index 82%
> rename from meta-webserver/recipes-webadmin/cockpit/cockpit_304.bb
> rename to meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb
> index edd51bc671..29bb771cd2 100644
> --- a/meta-webserver/recipes-webadmin/cockpit/cockpit_304.bb
> +++ b/meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb
> @@ -9,7 +9,7 @@ SRC_URI += " \
>      file://0001-Warn-not-error-if-xsltproc-is-not-found.patch \
>      file://cockpit.pam \
>      "
> -SRC_URI[sha256sum] = "a87d090c930e2058bb3e970ca7f2bafe678687966b5c0b8b42a802977e391ce9"
> +SRC_URI[sha256sum] = "df51ef5920fae69e1b435f657376aa93772c0c1720b954a3bac10ebba26bfedf"
>  
>  inherit gettext pkgconfig autotools systemd features_check
>  inherit ${@bb.utils.contains('PACKAGECONFIG', 'old-bridge', '', 'python3targetconfig', d)}
> @@ -28,11 +28,7 @@ COCKPIT_WS_USER_GROUP ?= "${COCKPIT_USER_GROUP}"
>  
>  EXTRA_AUTORECONF = "-I tools"
>  EXTRA_OECONF = " \
> -    --with-cockpit-user=${COCKPIT_USER_GROUP} \
> -    --with-cockpit-group=${COCKPIT_USER_GROUP} \
>      --with-admin-group=${COCKPIT_USER_GROUP} \
> -    --with-cockpit-ws-instance-user=${COCKPIT_WS_USER_GROUP} \
> -    --with-cockpit-ws-instance-group=${COCKPIT_WS_USER_GROUP} \
>      --disable-doc \
>      --with-systemdunitdir=${systemd_system_unitdir} \
>      --with-pamdir=${base_libdir}/security \
> @@ -40,14 +36,12 @@ EXTRA_OECONF = " \
>  
>  PACKAGECONFIG ??= " \
>      ${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)} \
> -    old-bridge \
>  "
>  
> -PACKAGECONFIG[pcp] = "--enable-pcp,--disable-pcp,pcp"
> -PACKAGECONFIG[dashboard] = "--enable-ssh,--disable-ssh,libssh"
> -PACKAGECONFIG[storaged] = ",,,udisks2"
> -PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit"
> -PACKAGECONFIG[old-bridge] = "--enable-old-bridge"
> +PACKAGECONFIG[pcp] = ",,pcp"
> +PACKAGECONFIG[dashboard] = ",,libssh"
> +PACKAGECONFIG[storaged] = ",,udisks2"
> +PACKAGECONFIG[polkit] = ",,polkit"
>  
>  PACKAGES =+ " \
>      ${PN}-pcp \
> @@ -83,27 +77,28 @@ FILES:${PN}-systemd = "${datadir}/cockpit/systemd"
>  FILES:${PN}-users = "${datadir}/cockpit/users"
>  FILES:${PN}-kdump = " \
>      ${datadir}/cockpit/kdump \
> -    ${datadir}/metainfo/org.cockpit-project.cockpit-kdump.metainfo.xml \
> +    ${datadir}/metainfo/org.cockpit_project.cockpit_kdump.metainfo.xml \
>  "
>  FILES:${PN}-sosreport = " \
>      ${datadir}/cockpit/sosreport \
> -    ${datadir}/metainfo/org.cockpit-project.cockpit-sosreport.metainfo.xml \
> +    ${datadir}/metainfo/org.cockpit_project.cockpit_sosreport.metainfo.xml \
>      ${datadir}/pixmaps/cockpit-sosreport.png \
> +    ${datadir}/icons/hicolor/64x64/apps/cockpit-sosreport.png \
>  "
>  FILES:${PN}-storaged = " \
>      ${datadir}/cockpit/storaged \
> -    ${datadir}/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml \
> +    ${datadir}/metainfo/org.cockpit_project.cockpit_storaged.metainfo.xml \
>  "
>  
>  FILES:${PN}-networkmanager = " \
>      ${datadir}/cockpit/networkmanager \
> -    ${datadir}/metainfo/org.cockpit-project.cockpit-networkmanager.metainfo.xml \
> +    ${datadir}/metainfo/org.cockpit_project.cockpit_networkmanager.metainfo.xml \
>  "
>  RDEPENDS:${PN}-networkmanager = "networkmanager"
>  
>  FILES:${PN}-selinux = " \
>      ${datadir}/cockpit/selinux \
> -    ${datadir}/metainfo/org.cockpit-project.cockpit-selinux.metainfo.xml \
> +    ${datadir}/metainfo/org.cockpit_project.cockpit_selinux.metainfo.xml \
>  "
>  FILES:${PN}-playground = "${datadir}/cockpit/playground"
>  FILES:${PN}-dashboard = "${datadir}/cockpit/dashboard"
> @@ -143,6 +138,9 @@ FILES:${PN}-ws = " \
>      ${systemd_system_unitdir}/cockpit-wsinstance-https@.socket \
>      ${systemd_system_unitdir}/cockpit-wsinstance-https@.service \
>      ${systemd_system_unitdir}/system-cockpithttps.slice \
> +    ${systemd_system_unitdir}/cockpit-session-socket-user.service \
> +    ${systemd_system_unitdir}/cockpit-wsinstance-socket-user.service \
> +    ${systemd_system_unitdir}/cockpit-issue.service \
>      ${libdir}/tmpfiles.d/cockpit-tempfiles.conf \
>      ${sbindir}/remotectl \
>      ${base_libdir}/security/pam_ssh_add.so \
> @@ -169,7 +167,8 @@ FILES:${PN} += " \
>      ${datadir}/cockpit/ssh \
>      ${libexecdir}/cockpit-ssh \
>      ${datadir}/cockpit \
> -    ${datadir}/metainfo/cockpit.appdata.xml \
> +    ${datadir}/icons/hicolor/128x128/apps/cockpit.png \
> +    ${datadir}/metainfo/org.cockpit_project.cockpit.appdata.xml \
>      ${datadir}/pixmaps/cockpit.png \
>      ${nonarch_libdir}/tmpfiles.d \
>      ${nonarch_libdir}/firewalld \
> @@ -187,7 +186,12 @@ do_install:append() {
>      install -p -m 0644 ${UNPACKDIR}/cockpit.pam ${D}${sysconfdir}/pam.d/cockpit
>  
>      # provided by firewalld
> -    rm -rf ${D}${libdir}/firewalld
> +    rm -rf ${D}${libdir}/firewalld \
> +    ${D}${PYTHON_SITEPACKAGES_DIR}/*/__pycache__ \
> +    ${D}${PYTHON_SITEPACKAGES_DIR}/*/*/__pycache__ \
> +    ${D}${PYTHON_SITEPACKAGES_DIR}/*/*/*/__pycache__ \
> +    ${D}${PYTHON_SITEPACKAGES_DIR}/*/*/*/*/__pycache__ \
> +    ${D}${PYTHON_SITEPACKAGES_DIR}/${BP}.dist-info/direct_url.json
>  
>      if ! ${@bb.utils.contains('PACKAGECONFIG', 'storaged', 'true', 'false', d)}; then
>          for filename in ${FILES:${PN}-storaged}
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#117373): https://lists.openembedded.org/g/openembedded-devel/message/117373
> Mute This Topic: https://lists.openembedded.org/mt/112894260/6084445
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [skandigraun@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Khem Raj May 9, 2025, 7:12 a.m. UTC | #2
On Thu, May 8, 2025 at 11:44 PM Gyorgy Sarvari <skandigraun@gmail.com> wrote:
>
> On 5/9/25 08:06, Khem Raj via lists.openembedded.org wrote:
> > Get rid of remoeved configure options
> >
> > ERROR: QA Issue: cockpit: configure was passed unrecognised options: --disable-pcp --enable-old-bridge --with-cockpit-ws-instance-user --disable-ssh --disable-polkit --with-cockpit-ws-instance-group --with-cockpit-group --with-cockpit-user [unknown-configure-option]
> I believe with this also the COCKPIT_WS_USER_GROUP variable became
> orphan and could be removed as part of the cleanup

Right, I have removed it and pushed the squashed change into
master-next. Thanks for looking into this

> >
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> >  .../{cockpit_304.bb => cockpit_337.bb}        | 40 ++++++++++---------
> >  1 file changed, 22 insertions(+), 18 deletions(-)
> >  rename meta-webserver/recipes-webadmin/cockpit/{cockpit_304.bb => cockpit_337.bb} (82%)
> >
> > diff --git a/meta-webserver/recipes-webadmin/cockpit/cockpit_304.bb b/meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb
> > similarity index 82%
> > rename from meta-webserver/recipes-webadmin/cockpit/cockpit_304.bb
> > rename to meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb
> > index edd51bc671..29bb771cd2 100644
> > --- a/meta-webserver/recipes-webadmin/cockpit/cockpit_304.bb
> > +++ b/meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb
> > @@ -9,7 +9,7 @@ SRC_URI += " \
> >      file://0001-Warn-not-error-if-xsltproc-is-not-found.patch \
> >      file://cockpit.pam \
> >      "
> > -SRC_URI[sha256sum] = "a87d090c930e2058bb3e970ca7f2bafe678687966b5c0b8b42a802977e391ce9"
> > +SRC_URI[sha256sum] = "df51ef5920fae69e1b435f657376aa93772c0c1720b954a3bac10ebba26bfedf"
> >
> >  inherit gettext pkgconfig autotools systemd features_check
> >  inherit ${@bb.utils.contains('PACKAGECONFIG', 'old-bridge', '', 'python3targetconfig', d)}
> > @@ -28,11 +28,7 @@ COCKPIT_WS_USER_GROUP ?= "${COCKPIT_USER_GROUP}"
> >
> >  EXTRA_AUTORECONF = "-I tools"
> >  EXTRA_OECONF = " \
> > -    --with-cockpit-user=${COCKPIT_USER_GROUP} \
> > -    --with-cockpit-group=${COCKPIT_USER_GROUP} \
> >      --with-admin-group=${COCKPIT_USER_GROUP} \
> > -    --with-cockpit-ws-instance-user=${COCKPIT_WS_USER_GROUP} \
> > -    --with-cockpit-ws-instance-group=${COCKPIT_WS_USER_GROUP} \
> >      --disable-doc \
> >      --with-systemdunitdir=${systemd_system_unitdir} \
> >      --with-pamdir=${base_libdir}/security \
> > @@ -40,14 +36,12 @@ EXTRA_OECONF = " \
> >
> >  PACKAGECONFIG ??= " \
> >      ${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)} \
> > -    old-bridge \
> >  "
> >
> > -PACKAGECONFIG[pcp] = "--enable-pcp,--disable-pcp,pcp"
> > -PACKAGECONFIG[dashboard] = "--enable-ssh,--disable-ssh,libssh"
> > -PACKAGECONFIG[storaged] = ",,,udisks2"
> > -PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit"
> > -PACKAGECONFIG[old-bridge] = "--enable-old-bridge"
> > +PACKAGECONFIG[pcp] = ",,pcp"
> > +PACKAGECONFIG[dashboard] = ",,libssh"
> > +PACKAGECONFIG[storaged] = ",,udisks2"
> > +PACKAGECONFIG[polkit] = ",,polkit"
> >
> >  PACKAGES =+ " \
> >      ${PN}-pcp \
> > @@ -83,27 +77,28 @@ FILES:${PN}-systemd = "${datadir}/cockpit/systemd"
> >  FILES:${PN}-users = "${datadir}/cockpit/users"
> >  FILES:${PN}-kdump = " \
> >      ${datadir}/cockpit/kdump \
> > -    ${datadir}/metainfo/org.cockpit-project.cockpit-kdump.metainfo.xml \
> > +    ${datadir}/metainfo/org.cockpit_project.cockpit_kdump.metainfo.xml \
> >  "
> >  FILES:${PN}-sosreport = " \
> >      ${datadir}/cockpit/sosreport \
> > -    ${datadir}/metainfo/org.cockpit-project.cockpit-sosreport.metainfo.xml \
> > +    ${datadir}/metainfo/org.cockpit_project.cockpit_sosreport.metainfo.xml \
> >      ${datadir}/pixmaps/cockpit-sosreport.png \
> > +    ${datadir}/icons/hicolor/64x64/apps/cockpit-sosreport.png \
> >  "
> >  FILES:${PN}-storaged = " \
> >      ${datadir}/cockpit/storaged \
> > -    ${datadir}/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml \
> > +    ${datadir}/metainfo/org.cockpit_project.cockpit_storaged.metainfo.xml \
> >  "
> >
> >  FILES:${PN}-networkmanager = " \
> >      ${datadir}/cockpit/networkmanager \
> > -    ${datadir}/metainfo/org.cockpit-project.cockpit-networkmanager.metainfo.xml \
> > +    ${datadir}/metainfo/org.cockpit_project.cockpit_networkmanager.metainfo.xml \
> >  "
> >  RDEPENDS:${PN}-networkmanager = "networkmanager"
> >
> >  FILES:${PN}-selinux = " \
> >      ${datadir}/cockpit/selinux \
> > -    ${datadir}/metainfo/org.cockpit-project.cockpit-selinux.metainfo.xml \
> > +    ${datadir}/metainfo/org.cockpit_project.cockpit_selinux.metainfo.xml \
> >  "
> >  FILES:${PN}-playground = "${datadir}/cockpit/playground"
> >  FILES:${PN}-dashboard = "${datadir}/cockpit/dashboard"
> > @@ -143,6 +138,9 @@ FILES:${PN}-ws = " \
> >      ${systemd_system_unitdir}/cockpit-wsinstance-https@.socket \
> >      ${systemd_system_unitdir}/cockpit-wsinstance-https@.service \
> >      ${systemd_system_unitdir}/system-cockpithttps.slice \
> > +    ${systemd_system_unitdir}/cockpit-session-socket-user.service \
> > +    ${systemd_system_unitdir}/cockpit-wsinstance-socket-user.service \
> > +    ${systemd_system_unitdir}/cockpit-issue.service \
> >      ${libdir}/tmpfiles.d/cockpit-tempfiles.conf \
> >      ${sbindir}/remotectl \
> >      ${base_libdir}/security/pam_ssh_add.so \
> > @@ -169,7 +167,8 @@ FILES:${PN} += " \
> >      ${datadir}/cockpit/ssh \
> >      ${libexecdir}/cockpit-ssh \
> >      ${datadir}/cockpit \
> > -    ${datadir}/metainfo/cockpit.appdata.xml \
> > +    ${datadir}/icons/hicolor/128x128/apps/cockpit.png \
> > +    ${datadir}/metainfo/org.cockpit_project.cockpit.appdata.xml \
> >      ${datadir}/pixmaps/cockpit.png \
> >      ${nonarch_libdir}/tmpfiles.d \
> >      ${nonarch_libdir}/firewalld \
> > @@ -187,7 +186,12 @@ do_install:append() {
> >      install -p -m 0644 ${UNPACKDIR}/cockpit.pam ${D}${sysconfdir}/pam.d/cockpit
> >
> >      # provided by firewalld
> > -    rm -rf ${D}${libdir}/firewalld
> > +    rm -rf ${D}${libdir}/firewalld \
> > +    ${D}${PYTHON_SITEPACKAGES_DIR}/*/__pycache__ \
> > +    ${D}${PYTHON_SITEPACKAGES_DIR}/*/*/__pycache__ \
> > +    ${D}${PYTHON_SITEPACKAGES_DIR}/*/*/*/__pycache__ \
> > +    ${D}${PYTHON_SITEPACKAGES_DIR}/*/*/*/*/__pycache__ \
> > +    ${D}${PYTHON_SITEPACKAGES_DIR}/${BP}.dist-info/direct_url.json
> >
> >      if ! ${@bb.utils.contains('PACKAGECONFIG', 'storaged', 'true', 'false', d)}; then
> >          for filename in ${FILES:${PN}-storaged}
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#117373): https://lists.openembedded.org/g/openembedded-devel/message/117373
> > Mute This Topic: https://lists.openembedded.org/mt/112894260/6084445
> > Group Owner: openembedded-devel+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [skandigraun@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>
diff mbox series

Patch

diff --git a/meta-webserver/recipes-webadmin/cockpit/cockpit_304.bb b/meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb
similarity index 82%
rename from meta-webserver/recipes-webadmin/cockpit/cockpit_304.bb
rename to meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb
index edd51bc671..29bb771cd2 100644
--- a/meta-webserver/recipes-webadmin/cockpit/cockpit_304.bb
+++ b/meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb
@@ -9,7 +9,7 @@  SRC_URI += " \
     file://0001-Warn-not-error-if-xsltproc-is-not-found.patch \
     file://cockpit.pam \
     "
-SRC_URI[sha256sum] = "a87d090c930e2058bb3e970ca7f2bafe678687966b5c0b8b42a802977e391ce9"
+SRC_URI[sha256sum] = "df51ef5920fae69e1b435f657376aa93772c0c1720b954a3bac10ebba26bfedf"
 
 inherit gettext pkgconfig autotools systemd features_check
 inherit ${@bb.utils.contains('PACKAGECONFIG', 'old-bridge', '', 'python3targetconfig', d)}
@@ -28,11 +28,7 @@  COCKPIT_WS_USER_GROUP ?= "${COCKPIT_USER_GROUP}"
 
 EXTRA_AUTORECONF = "-I tools"
 EXTRA_OECONF = " \
-    --with-cockpit-user=${COCKPIT_USER_GROUP} \
-    --with-cockpit-group=${COCKPIT_USER_GROUP} \
     --with-admin-group=${COCKPIT_USER_GROUP} \
-    --with-cockpit-ws-instance-user=${COCKPIT_WS_USER_GROUP} \
-    --with-cockpit-ws-instance-group=${COCKPIT_WS_USER_GROUP} \
     --disable-doc \
     --with-systemdunitdir=${systemd_system_unitdir} \
     --with-pamdir=${base_libdir}/security \
@@ -40,14 +36,12 @@  EXTRA_OECONF = " \
 
 PACKAGECONFIG ??= " \
     ${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)} \
-    old-bridge \
 "
 
-PACKAGECONFIG[pcp] = "--enable-pcp,--disable-pcp,pcp"
-PACKAGECONFIG[dashboard] = "--enable-ssh,--disable-ssh,libssh"
-PACKAGECONFIG[storaged] = ",,,udisks2"
-PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit"
-PACKAGECONFIG[old-bridge] = "--enable-old-bridge"
+PACKAGECONFIG[pcp] = ",,pcp"
+PACKAGECONFIG[dashboard] = ",,libssh"
+PACKAGECONFIG[storaged] = ",,udisks2"
+PACKAGECONFIG[polkit] = ",,polkit"
 
 PACKAGES =+ " \
     ${PN}-pcp \
@@ -83,27 +77,28 @@  FILES:${PN}-systemd = "${datadir}/cockpit/systemd"
 FILES:${PN}-users = "${datadir}/cockpit/users"
 FILES:${PN}-kdump = " \
     ${datadir}/cockpit/kdump \
-    ${datadir}/metainfo/org.cockpit-project.cockpit-kdump.metainfo.xml \
+    ${datadir}/metainfo/org.cockpit_project.cockpit_kdump.metainfo.xml \
 "
 FILES:${PN}-sosreport = " \
     ${datadir}/cockpit/sosreport \
-    ${datadir}/metainfo/org.cockpit-project.cockpit-sosreport.metainfo.xml \
+    ${datadir}/metainfo/org.cockpit_project.cockpit_sosreport.metainfo.xml \
     ${datadir}/pixmaps/cockpit-sosreport.png \
+    ${datadir}/icons/hicolor/64x64/apps/cockpit-sosreport.png \
 "
 FILES:${PN}-storaged = " \
     ${datadir}/cockpit/storaged \
-    ${datadir}/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml \
+    ${datadir}/metainfo/org.cockpit_project.cockpit_storaged.metainfo.xml \
 "
 
 FILES:${PN}-networkmanager = " \
     ${datadir}/cockpit/networkmanager \
-    ${datadir}/metainfo/org.cockpit-project.cockpit-networkmanager.metainfo.xml \
+    ${datadir}/metainfo/org.cockpit_project.cockpit_networkmanager.metainfo.xml \
 "
 RDEPENDS:${PN}-networkmanager = "networkmanager"
 
 FILES:${PN}-selinux = " \
     ${datadir}/cockpit/selinux \
-    ${datadir}/metainfo/org.cockpit-project.cockpit-selinux.metainfo.xml \
+    ${datadir}/metainfo/org.cockpit_project.cockpit_selinux.metainfo.xml \
 "
 FILES:${PN}-playground = "${datadir}/cockpit/playground"
 FILES:${PN}-dashboard = "${datadir}/cockpit/dashboard"
@@ -143,6 +138,9 @@  FILES:${PN}-ws = " \
     ${systemd_system_unitdir}/cockpit-wsinstance-https@.socket \
     ${systemd_system_unitdir}/cockpit-wsinstance-https@.service \
     ${systemd_system_unitdir}/system-cockpithttps.slice \
+    ${systemd_system_unitdir}/cockpit-session-socket-user.service \
+    ${systemd_system_unitdir}/cockpit-wsinstance-socket-user.service \
+    ${systemd_system_unitdir}/cockpit-issue.service \
     ${libdir}/tmpfiles.d/cockpit-tempfiles.conf \
     ${sbindir}/remotectl \
     ${base_libdir}/security/pam_ssh_add.so \
@@ -169,7 +167,8 @@  FILES:${PN} += " \
     ${datadir}/cockpit/ssh \
     ${libexecdir}/cockpit-ssh \
     ${datadir}/cockpit \
-    ${datadir}/metainfo/cockpit.appdata.xml \
+    ${datadir}/icons/hicolor/128x128/apps/cockpit.png \
+    ${datadir}/metainfo/org.cockpit_project.cockpit.appdata.xml \
     ${datadir}/pixmaps/cockpit.png \
     ${nonarch_libdir}/tmpfiles.d \
     ${nonarch_libdir}/firewalld \
@@ -187,7 +186,12 @@  do_install:append() {
     install -p -m 0644 ${UNPACKDIR}/cockpit.pam ${D}${sysconfdir}/pam.d/cockpit
 
     # provided by firewalld
-    rm -rf ${D}${libdir}/firewalld
+    rm -rf ${D}${libdir}/firewalld \
+    ${D}${PYTHON_SITEPACKAGES_DIR}/*/__pycache__ \
+    ${D}${PYTHON_SITEPACKAGES_DIR}/*/*/__pycache__ \
+    ${D}${PYTHON_SITEPACKAGES_DIR}/*/*/*/__pycache__ \
+    ${D}${PYTHON_SITEPACKAGES_DIR}/*/*/*/*/__pycache__ \
+    ${D}${PYTHON_SITEPACKAGES_DIR}/${BP}.dist-info/direct_url.json
 
     if ! ${@bb.utils.contains('PACKAGECONFIG', 'storaged', 'true', 'false', d)}; then
         for filename in ${FILES:${PN}-storaged}