[Buildroot] [PATCH] package/sysvinit: add version number to SYSVINIT_MAKE_OPTS

[Buildroot] [PATCH] package/sysvinit: add version number to SYSVINIT_MAKE_OPTS

[Cody Green]

Version environment variable VERSION=$(VERSION) is set in the top level
Makefile of the sysvinit:
$(MAKE) VERSION=$(VERSION) -C src $@

Build command SYSVINIT_BUILD_CMDS doesn't use the top level Makefile, but
src/Makefile instead without setting the VERSION variable, which leads to
undefined VERSION macro in src/init.c.

Add VERSION=$(SYSVINIT_VERSION) to SYSVINIT_MAKE_OPTS to make the VERSION
environment variable available in the src/Makefile.

Signed-off-by: Cody Green <cody@londelec.com>
---
 package/sysvinit/sysvinit.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk
index 7f37cea131..e05a6dee38 100644
--- a/package/sysvinit/sysvinit.mk
+++ b/package/sysvinit/sysvinit.mk
@@ -11,7 +11,7 @@ SYSVINIT_LICENSE = GPL-2.0+
 SYSVINIT_LICENSE_FILES = COPYING
 SYSVINIT_CPE_ID_VALID = YES

-SYSVINIT_MAKE_OPTS = SYSROOT=$(STAGING_DIR)
+SYSVINIT_MAKE_OPTS = SYSROOT=$(STAGING_DIR) VERSION=$(SYSVINIT_VERSION)

 ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
 SYSVINIT_DEPENDENCIES += libselinux
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] package/sysvinit: add version number to SYSVINIT_MAKE_OPTS

[Thomas Petazzoni via buildroot]

On Sat, 5 Oct 2024 15:15:39 +0100
Cody Green <cody@londelec.com> wrote:

> Version environment variable VERSION=$(VERSION) is set in the top level
> Makefile of the sysvinit:
> $(MAKE) VERSION=$(VERSION) -C src $@
> 
> Build command SYSVINIT_BUILD_CMDS doesn't use the top level Makefile, but
> src/Makefile instead without setting the VERSION variable, which leads to
> undefined VERSION macro in src/init.c.
> 
> Add VERSION=$(SYSVINIT_VERSION) to SYSVINIT_MAKE_OPTS to make the VERSION
> environment variable available in the src/Makefile.
> 
> Signed-off-by: Cody Green <cody@londelec.com>
> ---
>  package/sysvinit/sysvinit.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] package/sysvinit: add version number to SYSVINIT_MAKE_OPTS

[Peter Korsgaard]

>>>>> "Cody" == Cody Green <cody@londelec.com> writes:

 > Version environment variable VERSION=$(VERSION) is set in the top level
 > Makefile of the sysvinit:
 > $(MAKE) VERSION=$(VERSION) -C src $@

 > Build command SYSVINIT_BUILD_CMDS doesn't use the top level Makefile, but
 > src/Makefile instead without setting the VERSION variable, which leads to
 > undefined VERSION macro in src/init.c.

 > Add VERSION=$(SYSVINIT_VERSION) to SYSVINIT_MAKE_OPTS to make the VERSION
 > environment variable available in the src/Makefile.

 > Signed-off-by: Cody Green <cody@londelec.com>

Committed to 2024.02.x and 2024.08.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot