xbps-src: new "make_dirs" var for the mkdirs trigger.

This commit is contained in:
Juan RP 2011-11-09 15:18:39 +01:00
parent c41fe732be
commit ceabb62f9a
3 changed files with 16 additions and 23 deletions

View File

@ -48,7 +48,7 @@ xbps_write_metadata_pkg()
xml_catalogs sgml_catalogs gconf_entries gconf_schemas \ xml_catalogs sgml_catalogs gconf_entries gconf_schemas \
gtk_iconcache_dirs font_dirs dkms_modules provides \ gtk_iconcache_dirs font_dirs dkms_modules provides \
kernel_hooks_version conflicts pycompile_dirs \ kernel_hooks_version conflicts pycompile_dirs \
pycompile_module systemd_services pycompile_module systemd_services make_dirs
. $XBPS_SRCPKGDIR/${sourcepkg}/${subpkg}.template . $XBPS_SRCPKGDIR/${sourcepkg}/${subpkg}.template
pkgname=${subpkg} pkgname=${subpkg}
set_tmpl_common_vars set_tmpl_common_vars

View File

@ -76,7 +76,6 @@ UPDATE="\$4"
# The following code will run the triggers. # The following code will run the triggers.
# #
_EOF _EOF
# #
# Handle kernel hooks. # Handle kernel hooks.
# #
@ -84,15 +83,6 @@ _EOF
_add_trigger kernel-hooks _add_trigger kernel-hooks
echo "export kernel_hooks_version=\"${kernel_hooks_version}\"" >> $tmpf echo "export kernel_hooks_version=\"${kernel_hooks_version}\"" >> $tmpf
fi fi
#
# Handle systemd services.
#
if [ -n "${systemd_services}" ]; then
_add_trigger systemd-service
echo "export systemd_services=\"${systemd_services}\"" >> $tmpf
fi
# #
# Handle DKMS modules. # Handle DKMS modules.
# #
@ -100,7 +90,6 @@ _EOF
_add_trigger dkms _add_trigger dkms
echo "export dkms_modules=\"${dkms_modules}\"" >> $tmpf echo "export dkms_modules=\"${dkms_modules}\"" >> $tmpf
fi fi
# #
# Handle system groups. # Handle system groups.
# #
@ -135,6 +124,20 @@ _EOF
done done
fi fi
# #
# Handle mkdirs trigger.
#
if [ -n "${make_dirs}" ]; then
_add_trigger mkdirs
echo "export make_dirs=\"${make_dirs}\"" >> $tmpf
fi
#
# Handle systemd services.
#
if [ -n "${systemd_services}" ]; then
_add_trigger systemd-service
echo "export systemd_services=\"${systemd_services}\"" >> $tmpf
fi
#
# Handle GNU Info files. # Handle GNU Info files.
# #
if [ -d "${DESTDIR}/usr/share/info" ]; then if [ -d "${DESTDIR}/usr/share/info" ]; then
@ -154,7 +157,6 @@ _EOF
echo "export info_files=\"${info_files}\"" >> $tmpf echo "export info_files=\"${info_files}\"" >> $tmpf
fi fi
fi fi
# #
# (Un)Register a shell in /etc/shells. # (Un)Register a shell in /etc/shells.
# #
@ -162,7 +164,6 @@ _EOF
_add_trigger register-shell _add_trigger register-shell
echo "export register_shell=\"${register_shell}\"" >> $tmpf echo "export register_shell=\"${register_shell}\"" >> $tmpf
fi fi
# #
# Handle SGML/XML catalog entries via xmlcatmgr. # Handle SGML/XML catalog entries via xmlcatmgr.
# #
@ -185,7 +186,6 @@ _EOF
if [ -n "${sgml_entries}" -o -n "${xml_entries}" ]; then if [ -n "${sgml_entries}" -o -n "${xml_entries}" ]; then
_add_trigger xml-catalog _add_trigger xml-catalog
fi fi
# #
# Handle X11 font updates via mkfontdir/mkfontscale. # Handle X11 font updates via mkfontdir/mkfontscale.
# #
@ -193,7 +193,6 @@ _EOF
_add_trigger x11-fonts _add_trigger x11-fonts
echo "export font_dirs=\"${font_dirs}\"" >> $tmpf echo "export font_dirs=\"${font_dirs}\"" >> $tmpf
fi fi
# #
# Handle GTK+ Icon cache directories. # Handle GTK+ Icon cache directories.
# #
@ -202,7 +201,6 @@ _EOF
echo "export gtk_iconcache_dirs=\"${gtk_iconcache_dirs}\"" \ echo "export gtk_iconcache_dirs=\"${gtk_iconcache_dirs}\"" \
>> $tmpf >> $tmpf
fi fi
# #
# Handle .desktop files in /usr/share/applications with # Handle .desktop files in /usr/share/applications with
# desktop-file-utils. # desktop-file-utils.
@ -212,7 +210,6 @@ _EOF
_add_trigger update-desktopdb _add_trigger update-desktopdb
fi fi
fi fi
# #
# Handle GConf schemas/entries files with gconf-schemas. # Handle GConf schemas/entries files with gconf-schemas.
# #
@ -230,7 +227,6 @@ _EOF
>> $tmpf >> $tmpf
fi fi
fi fi
# #
# Handle gio-modules trigger. # Handle gio-modules trigger.
# #
@ -239,7 +235,6 @@ _EOF
_add_trigger gio-modules _add_trigger gio-modules
fi fi
fi fi
# #
# Handle gsettings schemas in /usr/share/glib-2.0/schemas with # Handle gsettings schemas in /usr/share/glib-2.0/schemas with
# gsettings-schemas. # gsettings-schemas.
@ -249,7 +244,6 @@ _EOF
_add_trigger gsettings-schemas _add_trigger gsettings-schemas
fi fi
fi fi
# #
# Handle mime database in /usr/share/mime with update-mime-database. # Handle mime database in /usr/share/mime with update-mime-database.
# #
@ -258,7 +252,6 @@ _EOF
_add_trigger mimedb _add_trigger mimedb
fi fi
fi fi
# #
# Handle python bytecode archives with pycompile trigger. # Handle python bytecode archives with pycompile trigger.
# #

View File

@ -98,7 +98,7 @@ reset_tmpl_vars()
disable_parallel_build run_depends font_dirs preserve \ disable_parallel_build run_depends font_dirs preserve \
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 \ abi_depends api_depends triggers make_dirs \
replaces system_accounts system_groups provides \ replaces system_accounts system_groups provides \
build_wrksrc create_wrksrc broken_as_needed pkgver \ build_wrksrc create_wrksrc broken_as_needed pkgver \
ignore_vdeps_dir noverifyrdeps conflicts dkms_modules \ ignore_vdeps_dir noverifyrdeps conflicts dkms_modules \