On Sat, Sep 12, 2020 at 3:11 PM Andre McCurdy wrote: > On Sat, Sep 12, 2020 at 12:46 PM Michael Gloff wrote: > > > > On Sat, Sep 12, 2020 at 2:11 PM Richard Purdie < > richard.purdie@linuxfoundation.org> wrote: > >> > >> On Sat, 2020-09-12 at 11:48 -0500, Michael Gloff wrote: > >> > In order for the VERSION variable to be set, the > >> > top level Makefile should be used, which only > >> > builds the code in /src anyway. > >> > > >> > Signed-off-by: Michael Gloff > >> > --- > >> > meta/recipes-core/sysvinit/sysvinit_2.97.bb | 1 - > >> > 1 file changed, 1 deletion(-) > >> > > >> > diff --git a/meta/recipes-core/sysvinit/sysvinit_2.97.bb > >> > b/meta/recipes-core/sysvinit/sysvinit_2.97.bb > >> > index 80ab9d70e7..98916f7f19 100644 > >> > --- a/meta/recipes-core/sysvinit/sysvinit_2.97.bb > >> > +++ b/meta/recipes-core/sysvinit/sysvinit_2.97.bb > >> > @@ -24,7 +24,6 @@ SRC_URI = > >> > "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.xz \ > >> > SRC_URI[sha256sum] = > >> > "2d5996857519bfd8634d2e1debabb3238fb38440f65fbfdc46420ee8bdf25110" > >> > > >> > S = "${WORKDIR}/sysvinit-${PV}" > >> > -B = "${S}/src" > >> > > >> > inherit update-alternatives features_check > >> > DEPENDS_append = " update-rc.d-native base-passwd virtual/crypt" > >> > >> I don't understand what you're saying. Why do we need the VERSION > >> variable to be set? Does sysvinit not support a separate build > >> directory? > >> > >> Can you rewrite the commit message so that someone who hasn't looked at > >> the code can understand what the problem is we're fixing, why its a > >> problem and why this is the correct solution. > >> > >> Thanks! > >> > >> Richard > > > > This issue is seeing no version on boot up since the switch from 2.88: > > INIT: version booting > > instead of: > > INIT: version 2.96 booting > > with this change. > > > > The VERSION variable that is used for all of the binaries of sysvinit is > defined in the top level Makefile. > > > > VERSION=$(shell sed -rn '1s/.*[[:blank:]]\((.*)\)[[:blank:]].*/\1/p' > doc/Changelog) > > > > I'm not sure about the separate build directory. Any tips? > > Thanks, > > A separate build directory typically only applies for components which > build with autotools, cmake, etc. For components such as this one > which build with handwritten Makefiles the default is to build in the > source directory. > > Anyway, the patch looks fine. Key point is that you want to run make > in the top level source directory rather than the "src" subdirectory > to ensure that variables set by the top level Makefile are correctly > defined. > > Thanks Andre, I kind of thought we couldn't do a separate build directory, but wanted to try. I'll amend the commit message > > Michael > > > > >