| Message ID | 20191030132759.8643-2-unixmania@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | support hooks and tables in virtual packages | expand |
Carlos, All, On 2019-10-30 10:27 -0300, unixmania@gmail.com spake thusly: > From: Carlos Santos <unixmania@gmail.com> > > Virtual packages are not built but it's useful to allow them to have > permission/device/user tables and target-finalize/rootfs-pre-cmd hooks. Agreed, that would be nice to deduplicate such things. > With this change we don't need to replicate date as currently done in What do you mean by "date"? > eudev and systemd user tables or test if the package is selected to add > a target-finalize hook as in luainterpreter. > > Signed-off-by: Carlos Santos <unixmania@gmail.com> > --- > package/pkg-generic.mk | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) > > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > index 893faba22a..7b3f1646ae 100644 > --- a/package/pkg-generic.mk > +++ b/package/pkg-generic.mk > @@ -930,6 +930,7 @@ $$($(2)_TARGET_DIRCLEAN): PKG=$(2) > # Compute the name of the Kconfig option that correspond to the > # package being enabled. We handle three cases: the special Linux > # kernel case, the bootloaders case, and the normal packages case. > +# Virtual packages are handled separately (see below). > ifeq ($(1),linux) > $(2)_KCONFIG_VAR = BR2_LINUX_KERNEL > else ifneq ($$(filter boot/% $$(foreach dir,$$(BR2_EXTERNAL_DIRS),$$(dir)/boot/%),$(pkgdir)),) > @@ -1118,6 +1119,22 @@ ifneq ($$($(2)_HELP_CMDS),) > HELP_PACKAGES += $(2) > endif > > +# Virtual packages are not built but it's useful to allow them to have > +# permission/device/user tables and target-finalize/rootfs-pre-cmd hooks. > +else ifeq ($$(BR2_PACKAGE_HAS_$(2)),y) # $(2)_KCONFIG_VAR Actually, I think that virtual packages should instead also be "nornal" packages, so that they use the standard code path. By "normal" package, I mean they should also have a BR2_PACKAGE_FOO option in addition to the BR2_PACKAGE_HAS_FOO option. For example, we already have one virtual package that is both normal and virtual: the skeleton package has both BR2_PACKAGE_HAS_SKELETON and BR2_PACKAGE_SKELETON. pkg-virtual.mk is probably the place to make that systematic, something like: BR2_PACKAGE_$(2) = $$(BR2_PACKAGE_HAS_$(2)) ... so that virtual packages do not have to all repeat the variable... Unless there is a big road-block that prevents virtual package to be treated as normal packages... Regards, Yann E. MORIN. > +ifneq ($$($(2)_PERMISSIONS),) > +PACKAGES_PERMISSIONS_TABLE += $$($(2)_PERMISSIONS)$$(sep) > +endif > +ifneq ($$($(2)_DEVICES),) > +PACKAGES_DEVICES_TABLE += $$($(2)_DEVICES)$$(sep) > +endif > +ifneq ($$($(2)_USERS),) > +PACKAGES_USERS += $$($(2)_USERS)$$(sep) > +endif > +TARGET_FINALIZE_HOOKS += $$($(2)_TARGET_FINALIZE_HOOKS) > +ROOTFS_PRE_CMD_HOOKS += $$($(2)_ROOTFS_PRE_CMD_HOOKS) > + > endif # $(2)_KCONFIG_VAR > endef # inner-generic-package > > -- > 2.18.1 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
On Thu, Oct 31, 2019 at 5:15 PM Yann E. MORIN <yann.morin.1998@free.fr> wrote: > > Carlos, All, > > On 2019-10-30 10:27 -0300, unixmania@gmail.com spake thusly: > > From: Carlos Santos <unixmania@gmail.com> > > > > Virtual packages are not built but it's useful to allow them to have > > permission/device/user tables and target-finalize/rootfs-pre-cmd hooks. > > Agreed, that would be nice to deduplicate such things. > > > With this change we don't need to replicate date as currently done in > > What do you mean by "date"? It means "typo", should be "data". > > eudev and systemd user tables or test if the package is selected to add > > a target-finalize hook as in luainterpreter. > > > > Signed-off-by: Carlos Santos <unixmania@gmail.com> > > --- > > package/pkg-generic.mk | 17 +++++++++++++++++ > > 1 file changed, 17 insertions(+) > > > > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > > index 893faba22a..7b3f1646ae 100644 > > --- a/package/pkg-generic.mk > > +++ b/package/pkg-generic.mk > > @@ -930,6 +930,7 @@ $$($(2)_TARGET_DIRCLEAN): PKG=$(2) > > # Compute the name of the Kconfig option that correspond to the > > # package being enabled. We handle three cases: the special Linux > > # kernel case, the bootloaders case, and the normal packages case. > > +# Virtual packages are handled separately (see below). > > ifeq ($(1),linux) > > $(2)_KCONFIG_VAR = BR2_LINUX_KERNEL > > else ifneq ($$(filter boot/% $$(foreach dir,$$(BR2_EXTERNAL_DIRS),$$(dir)/boot/%),$(pkgdir)),) > > @@ -1118,6 +1119,22 @@ ifneq ($$($(2)_HELP_CMDS),) > > HELP_PACKAGES += $(2) > > endif > > > > +# Virtual packages are not built but it's useful to allow them to have > > +# permission/device/user tables and target-finalize/rootfs-pre-cmd hooks. > > +else ifeq ($$(BR2_PACKAGE_HAS_$(2)),y) # $(2)_KCONFIG_VAR > > Actually, I think that virtual packages should instead also be "nornal" > packages, so that they use the standard code path. By "normal" package, > I mean they should also have a BR2_PACKAGE_FOO option in addition to the > BR2_PACKAGE_HAS_FOO option. So we could use this, instead, instead of the else below : # Compute the name of the Kconfig option that correspond to the # package being enabled. We handle three cases: the special Linux # kernel case, the bootloaders case, and the normal packages case. # Virtual packages are not built but it's useful to allow them to have # permission/device/user tables and target-finalize/rootfs-pre-cmd hooks. ifeq ($(1),linux) $(2)_KCONFIG_VAR = BR2_LINUX_KERNEL else ifneq ($$(filter boot/% $$(foreach dir,$$(BR2_EXTERNAL_DIRS),$$(dir)/boot/%),$(pkgdir)),) $(2)_KCONFIG_VAR = BR2_TARGET_$(2) else ifneq ($$(filter toolchain/% $$(foreach dir,$$(BR2_EXTERNAL_DIRS),$$(dir)/toolchain/%),$(pkgdir)),) $(2)_KCONFIG_VAR = BR2_$(2) else ifeq ($(2)_IS_VIRTUAL,YES) $(2)_KCONFIG_VAR = BR2_PACKAGE_HAS_$(2) else $(2)_KCONFIG_VAR = BR2_PACKAGE_$(2) endif > For example, we already have one virtual package that is both normal and > virtual: the skeleton package has both BR2_PACKAGE_HAS_SKELETON and > BR2_PACKAGE_SKELETON. Right, but BR2_PACKAGE_SKELETON does not seem to be used anywhere. Perhaps it should can be removed. > pkg-virtual.mk is probably the place to make that systematic, something > like: > > BR2_PACKAGE_$(2) = $$(BR2_PACKAGE_HAS_$(2)) > > ... so that virtual packages do not have to all repeat the variable... > > Unless there is a big road-block that prevents virtual package to be > treated as normal packages... It creates a conflict with BR2_PACKAGE_UDEV in Config.in.legacy. > Regards, > Yann E. MORIN. > > > +ifneq ($$($(2)_PERMISSIONS),) > > +PACKAGES_PERMISSIONS_TABLE += $$($(2)_PERMISSIONS)$$(sep) > > +endif > > +ifneq ($$($(2)_DEVICES),) > > +PACKAGES_DEVICES_TABLE += $$($(2)_DEVICES)$$(sep) > > +endif > > +ifneq ($$($(2)_USERS),) > > +PACKAGES_USERS += $$($(2)_USERS)$$(sep) > > +endif > > +TARGET_FINALIZE_HOOKS += $$($(2)_TARGET_FINALIZE_HOOKS) > > +ROOTFS_PRE_CMD_HOOKS += $$($(2)_ROOTFS_PRE_CMD_HOOKS) > > + > > endif # $(2)_KCONFIG_VAR > > endef # inner-generic-package > > > > -- > > 2.18.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot@busybox.net > > http://lists.busybox.net/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------'
On Thu, Oct 31, 2019 at 6:47 PM Carlos Santos <unixmania@gmail.com> wrote: > > On Thu, Oct 31, 2019 at 5:15 PM Yann E. MORIN <yann.morin.1998@free.fr> wrote: > > > > Carlos, All, > > > > On 2019-10-30 10:27 -0300, unixmania@gmail.com spake thusly: > > > From: Carlos Santos <unixmania@gmail.com> > > > > > > Virtual packages are not built but it's useful to allow them to have > > > permission/device/user tables and target-finalize/rootfs-pre-cmd hooks. > > > > Agreed, that would be nice to deduplicate such things. > > > > > With this change we don't need to replicate date as currently done in > > > > What do you mean by "date"? > > It means "typo", should be "data". > > > > eudev and systemd user tables or test if the package is selected to add > > > a target-finalize hook as in luainterpreter. > > > > > > Signed-off-by: Carlos Santos <unixmania@gmail.com> > > > --- > > > package/pkg-generic.mk | 17 +++++++++++++++++ > > > 1 file changed, 17 insertions(+) > > > > > > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > > > index 893faba22a..7b3f1646ae 100644 > > > --- a/package/pkg-generic.mk > > > +++ b/package/pkg-generic.mk > > > @@ -930,6 +930,7 @@ $$($(2)_TARGET_DIRCLEAN): PKG=$(2) > > > # Compute the name of the Kconfig option that correspond to the > > > # package being enabled. We handle three cases: the special Linux > > > # kernel case, the bootloaders case, and the normal packages case. > > > +# Virtual packages are handled separately (see below). > > > ifeq ($(1),linux) > > > $(2)_KCONFIG_VAR = BR2_LINUX_KERNEL > > > else ifneq ($$(filter boot/% $$(foreach dir,$$(BR2_EXTERNAL_DIRS),$$(dir)/boot/%),$(pkgdir)),) > > > @@ -1118,6 +1119,22 @@ ifneq ($$($(2)_HELP_CMDS),) > > > HELP_PACKAGES += $(2) > > > endif > > > > > > +# Virtual packages are not built but it's useful to allow them to have > > > +# permission/device/user tables and target-finalize/rootfs-pre-cmd hooks. > > > +else ifeq ($$(BR2_PACKAGE_HAS_$(2)),y) # $(2)_KCONFIG_VAR > > > > Actually, I think that virtual packages should instead also be "nornal" > > packages, so that they use the standard code path. By "normal" package, > > I mean they should also have a BR2_PACKAGE_FOO option in addition to the > > BR2_PACKAGE_HAS_FOO option. > > So we could use this, instead, instead of the else below : > > # Compute the name of the Kconfig option that correspond to the > # package being enabled. We handle three cases: the special Linux > # kernel case, the bootloaders case, and the normal packages case. > # Virtual packages are not built but it's useful to allow them to have > # permission/device/user tables and target-finalize/rootfs-pre-cmd > hooks. > ifeq ($(1),linux) > $(2)_KCONFIG_VAR = BR2_LINUX_KERNEL > else ifneq ($$(filter boot/% $$(foreach > dir,$$(BR2_EXTERNAL_DIRS),$$(dir)/boot/%),$(pkgdir)),) > $(2)_KCONFIG_VAR = BR2_TARGET_$(2) > else ifneq ($$(filter toolchain/% $$(foreach > dir,$$(BR2_EXTERNAL_DIRS),$$(dir)/toolchain/%),$(pkgdir)),) > $(2)_KCONFIG_VAR = BR2_$(2) > else ifeq ($(2)_IS_VIRTUAL,YES) > $(2)_KCONFIG_VAR = BR2_PACKAGE_HAS_$(2) > else > $(2)_KCONFIG_VAR = BR2_PACKAGE_$(2) > endif I attempted this solution but it adds virtual packages to the global package list unless I add something like ifeq ($$($(2)_IS_VIRTUAL),) PACKAGES += $(1) endif Also it does not seem to make sense to check FOO_PROVIDES and process reverse dependencies.
On 30/10/2019 14:27, unixmania@gmail.com wrote: > From: Carlos Santos <unixmania@gmail.com> > > Virtual packages are not built but it's useful to allow them to have > permission/device/user tables and target-finalize/rootfs-pre-cmd hooks. > > With this change we don't need to replicate date as currently done in > eudev and systemd user tables or test if the package is selected to add > a target-finalize hook as in luainterpreter. > > Signed-off-by: Carlos Santos <unixmania@gmail.com> Since Yann's suggestion didn't work, I've applied the original (with typo fixes in commit message) to next, thanks. Regards, Arnout
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 893faba22a..7b3f1646ae 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -930,6 +930,7 @@ $$($(2)_TARGET_DIRCLEAN): PKG=$(2) # Compute the name of the Kconfig option that correspond to the # package being enabled. We handle three cases: the special Linux # kernel case, the bootloaders case, and the normal packages case. +# Virtual packages are handled separately (see below). ifeq ($(1),linux) $(2)_KCONFIG_VAR = BR2_LINUX_KERNEL else ifneq ($$(filter boot/% $$(foreach dir,$$(BR2_EXTERNAL_DIRS),$$(dir)/boot/%),$(pkgdir)),) @@ -1118,6 +1119,22 @@ ifneq ($$($(2)_HELP_CMDS),) HELP_PACKAGES += $(2) endif +# Virtual packages are not built but it's useful to allow them to have +# permission/device/user tables and target-finalize/rootfs-pre-cmd hooks. +else ifeq ($$(BR2_PACKAGE_HAS_$(2)),y) # $(2)_KCONFIG_VAR + +ifneq ($$($(2)_PERMISSIONS),) +PACKAGES_PERMISSIONS_TABLE += $$($(2)_PERMISSIONS)$$(sep) +endif +ifneq ($$($(2)_DEVICES),) +PACKAGES_DEVICES_TABLE += $$($(2)_DEVICES)$$(sep) +endif +ifneq ($$($(2)_USERS),) +PACKAGES_USERS += $$($(2)_USERS)$$(sep) +endif +TARGET_FINALIZE_HOOKS += $$($(2)_TARGET_FINALIZE_HOOKS) +ROOTFS_PRE_CMD_HOOKS += $$($(2)_ROOTFS_PRE_CMD_HOOKS) + endif # $(2)_KCONFIG_VAR endef # inner-generic-package