diff options
3 files changed, 22 insertions, 56 deletions
diff --git a/meta-app-framework/recipes-config/agl-users/agl-users_0.1.bb b/meta-app-framework/recipes-config/agl-users/agl-users_0.1.bb index 0f61248db..832c51c99 100644 --- a/meta-app-framework/recipes-config/agl-users/agl-users_0.1.bb +++ b/meta-app-framework/recipes-config/agl-users/agl-users_0.1.bb @@ -10,10 +10,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 SRC_URI = "" - -RDEPENDS_${PN}_append_smack = " smack-userspace" -DEPENDS_append_smack = " smack-userspace-native" - ALLOW_EMPTY_${PN} = "1" USERADD_PACKAGES = "${PN}" @@ -23,43 +19,3 @@ USERADD_PARAM_${PN} = "\ -g users -d /home/agl-passenger -m -K PASS_MAX_DAYS=-1 agl-passenger \ " - -do_configure() { - : -} - -do_compile() { - : -} - -do_install() { - : -} - - -pkg_postinst_${PN}() { - #!/bin/sh -e - - # avoid to run on host - [ x"$D" != "x" ] && exit 1 - - # Drops password - passwd -d agl-driver - passwd -d agl-passenger -} - -pkg_postinst_${PN}_smack() { - #!/bin/sh -e - - # avoid to run on host - [ x"$D" != "x" ] && exit 1 - - # Actions to carry out on the device go here - for x in /etc/skel /home/* - do - chsmack -a User::Home $x - done - passwd -d agl-driver - passwd -d agl-passenger -} - diff --git a/meta-app-framework/recipes-core/af-main/af-main_1.0.bb b/meta-app-framework/recipes-core/af-main/af-main_1.0.bb index e229cd22f..86b5d34e2 100644 --- a/meta-app-framework/recipes-core/af-main/af-main_1.0.bb +++ b/meta-app-framework/recipes-core/af-main/af-main_1.0.bb @@ -86,18 +86,6 @@ do_install_append_qemux86-64() { sed -i -e '/LD_PRELOAD=\/usr\/lib\/libEGL.so/d' ${D}${systemd_user_unitdir}/afm-user-daemon.service } -do_install_append_smack () { - install -d ${D}/${sysconfdir}/smack/accesses.d - cat > ${D}/${sysconfdir}/smack/accesses.d/default-access-domains-no-user <<EOF -System User::App-Shared rwxat -System User::Home rwxat -EOF - chmod 0644 ${D}/${sysconfdir}/smack/accesses.d/default-access-domains-no-user - install -d ${D}/${sysconfdir}/skel/app-data - chsmack -a 'User::Home' -t -D ${D}/${sysconfdir}/skel - chsmack -a 'User::App-Shared' -D ${D}/${sysconfdir}/skel/app-data -} - pkg_postinst_${PN}() { mkdir -p $D${afm_init_datadir}/applications $D${afm_init_datadir}/icons setcap cap_mac_override,cap_dac_override=ep $D${bindir}/afm-system-daemon diff --git a/meta-app-framework/recipes-core/base-files/base-files_%.bbappend b/meta-app-framework/recipes-core/base-files/base-files_%.bbappend new file mode 100644 index 000000000..7e12bc829 --- /dev/null +++ b/meta-app-framework/recipes-core/base-files/base-files_%.bbappend @@ -0,0 +1,22 @@ +DEPENDS_append_smack = " smack-userspace-native" +RDEPENDS_${PN}_append_smack = " smack-userspace" + +do_install_append() { + install -d ${D}/${sysconfdir}/skel/app-data + install -d ${D}/${sysconfdir}/skel/.config +} + +do_install_append_smack () { + install -d ${D}/${sysconfdir}/smack/accesses.d + cat > ${D}/${sysconfdir}/smack/accesses.d/default-access-domains-no-user <<EOF +System User::App-Shared rwxat +System User::Home rwxat +EOF + chmod 0644 ${D}/${sysconfdir}/smack/accesses.d/default-access-domains-no-user +} + +pkg_postinst_${PN}_append_smack() { + chsmack -r -a 'User::Home' -t -D $D/${sysconfdir}/skel + chsmack -a 'User::App-Shared' -D $D/${sysconfdir}/skel/app-data +} + |