mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-07 05:10:20 +00:00
cleanup after polkit fix
This commit removes the need to fix polkit permissions: https://git.openembedded.org/meta-openembedded/commit/?h=master-next&id=d5e90541f8e35916abc930b2da6de037b23d51a1 That allows to do some cleanup Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
+1
-11
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
|
|||||||
|
|
||||||
GNOMEBASEBUILDCLASS = "meson"
|
GNOMEBASEBUILDCLASS = "meson"
|
||||||
|
|
||||||
inherit gnomebase gettext gsettings features_check useradd
|
inherit gnomebase gettext gsettings features_check
|
||||||
|
|
||||||
REQUIRED_DISTRO_FEATURES = "opengl polkit"
|
REQUIRED_DISTRO_FEATURES = "opengl polkit"
|
||||||
|
|
||||||
@@ -36,15 +36,5 @@ PACKAGECONFIG[vnc] = "-Dvnc=true,-Dvnc=false,libvncserver"
|
|||||||
PACKAGECONFIG[rdp] = "-Drdp=true,-Drdp=false,freerdp3 fuse3 libxkbcommon"
|
PACKAGECONFIG[rdp] = "-Drdp=true,-Drdp=false,freerdp3 fuse3 libxkbcommon"
|
||||||
PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd"
|
PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd"
|
||||||
|
|
||||||
USERADD_PACKAGES = "${PN}"
|
|
||||||
USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd"
|
|
||||||
|
|
||||||
do_install:append() {
|
|
||||||
if [ -d ${D}${datadir}/polkit-1/rules.d ]; then
|
|
||||||
chmod 700 ${D}${datadir}/polkit-1/rules.d
|
|
||||||
chown polkitd:root ${D}${datadir}/polkit-1/rules.d
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
|
PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
|
||||||
FILES:${PN} += "${systemd_user_unitdir} ${systemd_system_unitdir} ${datadir} ${libdir}/sysusers.d ${libdir}/tmpfiles.d"
|
FILES:${PN} += "${systemd_user_unitdir} ${systemd_system_unitdir} ${datadir} ${libdir}/sysusers.d ${libdir}/tmpfiles.d"
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ DEPENDS = " \
|
|||||||
upower \
|
upower \
|
||||||
"
|
"
|
||||||
|
|
||||||
inherit gtk-icon-cache pkgconfig gnomebase gsettings gettext upstream-version-is-even bash-completion features_check useradd
|
inherit gtk-icon-cache pkgconfig gnomebase gsettings gettext upstream-version-is-even bash-completion features_check
|
||||||
|
|
||||||
REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd x11"
|
REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd x11"
|
||||||
|
|
||||||
@@ -52,16 +52,6 @@ EXTRA_OEMESON += "-Doe_sysroot=${STAGING_DIR_HOST}"
|
|||||||
|
|
||||||
export XDG_DATA_DIRS = "${STAGING_DATADIR}"
|
export XDG_DATA_DIRS = "${STAGING_DATADIR}"
|
||||||
|
|
||||||
USERADD_PACKAGES = "${PN}"
|
|
||||||
USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd"
|
|
||||||
|
|
||||||
do_install:append() {
|
|
||||||
if [ -d ${D}${datadir}/polkit-1/rules.d ]; then
|
|
||||||
chmod 700 ${D}${datadir}/polkit-1/rules.d
|
|
||||||
chown polkitd:root ${D}${datadir}/polkit-1/rules.d
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
|
PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
|
||||||
|
|
||||||
FILES:${PN} += " \
|
FILES:${PN} += " \
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ DESCRIPTION = "gvfs is a userspace virtual filesystem"
|
|||||||
LICENSE = "LGPL-2.0-only"
|
LICENSE = "LGPL-2.0-only"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e"
|
||||||
|
|
||||||
inherit gnomebase gsettings bash-completion gettext upstream-version-is-even features_check useradd
|
inherit gnomebase gsettings bash-completion gettext upstream-version-is-even features_check
|
||||||
|
|
||||||
DEPENDS += "\
|
DEPENDS += "\
|
||||||
dbus \
|
dbus \
|
||||||
@@ -77,16 +77,7 @@ PACKAGECONFIG[fuse] = "-Dfuse=true, -Dfuse=false, fuse3"
|
|||||||
# libcdio-paranoia recipe doesn't exist yet
|
# libcdio-paranoia recipe doesn't exist yet
|
||||||
PACKAGECONFIG[cdda] = "-Dcdda=true, -Dcdda=false, libcdio-paranoia"
|
PACKAGECONFIG[cdda] = "-Dcdda=true, -Dcdda=false, libcdio-paranoia"
|
||||||
|
|
||||||
USERADD_PACKAGES = "${PN}"
|
|
||||||
USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd"
|
|
||||||
|
|
||||||
do_install:append() {
|
do_install:append() {
|
||||||
if ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'true', 'false', d)}; then
|
|
||||||
# Fix up permissions on polkit rules.d to work with rpm4 constraints
|
|
||||||
chmod 700 ${D}${datadir}/polkit-1/rules.d
|
|
||||||
chown polkitd:root ${D}${datadir}/polkit-1/rules.d
|
|
||||||
fi
|
|
||||||
|
|
||||||
# After rebuilds (not from scracth) it can happen that the executables in
|
# After rebuilds (not from scracth) it can happen that the executables in
|
||||||
# libexec ar missing executable permission flag. Not sure but it came up
|
# libexec ar missing executable permission flag. Not sure but it came up
|
||||||
# during transition to meson. Looked into build files and logs but could
|
# during transition to meson. Looked into build files and logs but could
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
|||||||
|
|
||||||
DEPENDS = "gtk+3 glib-2.0 bluez5 python3-pygobject python3-cython-native"
|
DEPENDS = "gtk+3 glib-2.0 bluez5 python3-pygobject python3-cython-native"
|
||||||
|
|
||||||
inherit meson gettext systemd gsettings pkgconfig python3native gtk-icon-cache useradd features_check python3targetconfig
|
inherit meson gettext systemd gsettings pkgconfig python3native gtk-icon-cache features_check python3targetconfig
|
||||||
|
|
||||||
REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
|
REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
|
||||||
|
|
||||||
@@ -60,12 +60,3 @@ do_install:append() {
|
|||||||
${D}${bindir}/blueman-services \
|
${D}${bindir}/blueman-services \
|
||||||
${D}${bindir}/blueman-tray
|
${D}${bindir}/blueman-tray
|
||||||
}
|
}
|
||||||
|
|
||||||
USERADD_PACKAGES = "${PN}"
|
|
||||||
USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 --shell /bin/nologin polkitd"
|
|
||||||
|
|
||||||
do_install:append() {
|
|
||||||
# Fix up permissions on polkit rules.d to work with rpm4 constraints
|
|
||||||
chmod 700 ${D}/${datadir}/polkit-1/rules.d
|
|
||||||
chown polkitd:root ${D}/${datadir}/polkit-1/rules.d
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
|
|||||||
# Machine-specific as we examine MACHINE_FEATURES to decide whether to build the UEFI plugins
|
# Machine-specific as we examine MACHINE_FEATURES to decide whether to build the UEFI plugins
|
||||||
PACKAGE_ARCH = "${MACHINE_ARCH}"
|
PACKAGE_ARCH = "${MACHINE_ARCH}"
|
||||||
|
|
||||||
inherit meson vala gobject-introspection systemd bash-completion pkgconfig gi-docgen ptest manpages useradd
|
inherit meson vala gobject-introspection systemd bash-completion pkgconfig gi-docgen ptest manpages
|
||||||
|
|
||||||
GIDOCGEN_MESON_OPTION = 'docs'
|
GIDOCGEN_MESON_OPTION = 'docs'
|
||||||
GIDOCGEN_MESON_ENABLE_FLAG = 'enabled'
|
GIDOCGEN_MESON_ENABLE_FLAG = 'enabled'
|
||||||
@@ -116,17 +116,6 @@ DISABLE_NON_X86:x86 = ""
|
|||||||
DISABLE_NON_X86:x86-64 = ""
|
DISABLE_NON_X86:x86-64 = ""
|
||||||
PACKAGECONFIG:remove = "${DISABLE_NON_X86}"
|
PACKAGECONFIG:remove = "${DISABLE_NON_X86}"
|
||||||
|
|
||||||
USERADD_PACKAGES = "${PN}"
|
|
||||||
USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 --shell /bin/nologin polkitd"
|
|
||||||
|
|
||||||
do_install:append() {
|
|
||||||
if ${@bb.utils.contains('PACKAGECONFIG', 'polkit', 'true', 'false', d)}; then
|
|
||||||
#Fix up permissions on polkit rules.d to work with rpm4 constraints
|
|
||||||
chmod 700 ${D}/${datadir}/polkit-1/rules.d
|
|
||||||
chown polkitd:root ${D}/${datadir}/polkit-1/rules.d
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
FILES:${PN} += "${libdir}/fwupd-plugins-* \
|
FILES:${PN} += "${libdir}/fwupd-plugins-* \
|
||||||
${libdir}/fwupd-${PV} \
|
${libdir}/fwupd-${PV} \
|
||||||
${systemd_unitdir} \
|
${systemd_unitdir} \
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ SRCREV = "8b4f523c4f8287d57f1a84a3a8216efe200c5fbf"
|
|||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
inherit meson pkgconfig gettext systemd gtk-doc gobject-introspection python3native useradd mime features_check
|
inherit meson pkgconfig gettext systemd gtk-doc gobject-introspection python3native mime features_check
|
||||||
|
|
||||||
REQUIRED_DISTRO_FEATURES = "polkit"
|
REQUIRED_DISTRO_FEATURES = "polkit"
|
||||||
|
|
||||||
@@ -76,12 +76,3 @@ EXTRA_OEMESON = " \
|
|||||||
"
|
"
|
||||||
|
|
||||||
FILES:${PN} += "${libdir} ${datadir}"
|
FILES:${PN} += "${libdir} ${datadir}"
|
||||||
|
|
||||||
USERADD_PACKAGES = "${PN}"
|
|
||||||
USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd"
|
|
||||||
|
|
||||||
do_install:append() {
|
|
||||||
chmod 0700 ${D}/${datadir}/polkit-1/rules.d
|
|
||||||
chown polkitd ${D}/${datadir}/polkit-1/rules.d
|
|
||||||
chgrp root ${D}/${datadir}/polkit-1/rules.d
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ DEPENDS = " \
|
|||||||
|
|
||||||
GIR_MESON_OPTION = ""
|
GIR_MESON_OPTION = ""
|
||||||
|
|
||||||
inherit meson pkgconfig gobject-introspection gettext features_check useradd
|
inherit meson pkgconfig gobject-introspection gettext features_check
|
||||||
|
|
||||||
REQUIRED_DISTRO_FEATURES = "pam polkit gobject-introspection"
|
REQUIRED_DISTRO_FEATURES = "pam polkit gobject-introspection"
|
||||||
|
|
||||||
@@ -26,15 +26,6 @@ PACKAGECONFIG[ui] = ",,,malcontent-ui"
|
|||||||
|
|
||||||
EXTRA_OEMESON = "-Dui=disabled"
|
EXTRA_OEMESON = "-Dui=disabled"
|
||||||
|
|
||||||
USERADD_PACKAGES = "${PN}"
|
|
||||||
USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 --shell /bin/nologin polkitd"
|
|
||||||
|
|
||||||
do_install:append() {
|
|
||||||
# Fix up permissions on polkit rules.d to work with rpm4 constraints
|
|
||||||
chmod 700 ${D}/${datadir}/polkit-1/rules.d
|
|
||||||
chown polkitd:root ${D}/${datadir}/polkit-1/rules.d
|
|
||||||
}
|
|
||||||
|
|
||||||
FILES:${PN} += " \
|
FILES:${PN} += " \
|
||||||
${libdir}/security/pam_malcontent.so \
|
${libdir}/security/pam_malcontent.so \
|
||||||
${datadir}/accountsservice \
|
${datadir}/accountsservice \
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bdfdd4986a0853eb84eeba85f9d0c4d6"
|
|||||||
|
|
||||||
DEPENDS = "glib-2.0 dbus json-glib libsoup-3.0 intltool-native"
|
DEPENDS = "glib-2.0 dbus json-glib libsoup-3.0 intltool-native"
|
||||||
|
|
||||||
inherit meson pkgconfig gtk-doc gobject-introspection vala useradd
|
inherit meson pkgconfig gtk-doc gobject-introspection vala
|
||||||
|
|
||||||
SRCREV = "8a24f60969d4c235d9918796c38a6a9c42e10131"
|
SRCREV = "8a24f60969d4c235d9918796c38a6a9c42e10131"
|
||||||
SRC_URI = "git://gitlab.freedesktop.org/geoclue/geoclue.git;protocol=https;branch=master \
|
SRC_URI = "git://gitlab.freedesktop.org/geoclue/geoclue.git;protocol=https;branch=master \
|
||||||
@@ -36,17 +36,6 @@ EXTRA_OEMESON += " \
|
|||||||
-Ddbus-sys-dir=${sysconfdir}/dbus-1/system.d \
|
-Ddbus-sys-dir=${sysconfdir}/dbus-1/system.d \
|
||||||
"
|
"
|
||||||
|
|
||||||
USERADD_PACKAGES = "${PN}"
|
|
||||||
USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 --shell /bin/nologin polkitd"
|
|
||||||
|
|
||||||
do_install:append() {
|
|
||||||
if ${@bb.utils.contains('PACKAGECONFIG', 'modem-gps', 'true', 'false', d)}; then
|
|
||||||
# Fix up permissions on polkit rules.d to work with rpm4 constraints
|
|
||||||
chmod 700 ${D}/${datadir}/polkit-1/rules.d
|
|
||||||
chown polkitd:root ${D}/${datadir}/polkit-1/rules.d
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
FILES:${PN} += " \
|
FILES:${PN} += " \
|
||||||
${datadir}/dbus-1/system-services \
|
${datadir}/dbus-1/system-services \
|
||||||
${datadir}/polkit-1/rules.d \
|
${datadir}/polkit-1/rules.d \
|
||||||
|
|||||||
Reference in New Issue
Block a user