moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

xbps-src: added new var 'system_groups' for pkgs requiring new system groups.

Browse source
This commit is contained in:
Juan RP 2010-12-28 11:23:33 +01:00
parent 809bb752fa
commit 2168077d11
3 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
xbps-src/shutils/metadata.sh
View file

@ -54,10 +54,10 @@ xbps_write_metadata_pkg()
fi fi
setup_tmpl ${sourcepkg} setup_tmpl ${sourcepkg}
unset run_depends conf_files noarch triggers replaces \ unset run_depends conf_files noarch triggers replaces \
revision openrc_services system_accounts \ revision openrc_services system_accounts system_groups \
preserve keep_empty_dirs xml_entries sgml_entries \ preserve keep_empty_dirs xml_entries sgml_entries \
xml_catalogs sgml_catalogs gconf_entries gconf_schemas \ xml_catalogs sgml_catalogs gconf_entries gconf_schemas \
gtk_iconcache_dirs font_dirs gtk_iconcache_dirs font_dirs dkms_modules
. $XBPS_SRCPKGDIR/${sourcepkg}/${subpkg}.template . $XBPS_SRCPKGDIR/${sourcepkg}/${subpkg}.template
pkgname=${subpkg} pkgname=${subpkg}
set_tmpl_common_vars set_tmpl_common_vars
@ -303,9 +303,9 @@ _EOF
fi fi
# #
# If package sets $system_accounts, add shadow rundep. # If package sets $system_accounts or $system_groups, add shadow rundep.
# #
if [ -n "$system_accounts" ]; then if [ -n "$system_accounts" -o -n "$system_groups" ]; then
Add_dependency run shadow Add_dependency run shadow
fi fi

8
xbps-src/shutils/metadata_scripts.sh
View file

@ -92,6 +92,13 @@ _EOF
echo "export openrc_services=\"${openrc_services}\"" >> $tmpf echo "export openrc_services=\"${openrc_services}\"" >> $tmpf
fi fi
#
# Handle system groups.
#
if [ -n "${system_groups}" ]; then
_add_trigger system-accounts
echo "export system_groups=\"${system_groups}\"" >> $tmpf
fi
# #
# Handle system accounts. # Handle system accounts.
# #
@ -118,7 +125,6 @@ _EOF
unset homedir shell descr groups unset homedir shell descr groups
done done
fi fi
# #
# Handle GNU Info files. # Handle GNU Info files.
# #

3
xbps-src/shutils/tmpl_funcs.sh.in
View file

@ -74,7 +74,8 @@ reset_tmpl_vars()
only_for_archs conf_files keep_libtool_archives \ only_for_archs conf_files keep_libtool_archives \
noarch subpackages sourcepkg gtk_iconcache_dirs \ noarch subpackages sourcepkg gtk_iconcache_dirs \
abi_depends api_depends triggers openrc_services \ abi_depends api_depends triggers openrc_services \
replaces system_accounts build_wrksrc create_wrksrc \ replaces system_accounts system_groups \
build_wrksrc create_wrksrc \
ignore_vdeps_dir noverifyrdeps conflicts dkms_modules \ ignore_vdeps_dir noverifyrdeps conflicts dkms_modules \
gconf_entries gconf_schemas stow_copy stow_copy_files \ gconf_entries gconf_schemas stow_copy stow_copy_files \
pre_remove post_remove post_stow do_build do_install \ pre_remove post_remove post_stow do_build do_install \