Fixes: a5706b80f42e ("Set version to 4.17: rerun autogen.sh")
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Wei Liu <wl@xen.org>
CC: Anthony PERARD <anthony.perard@citrix.com>
CC: Juergen Gross <jgross@suse.com>

This gets forgotten each release.  Any chance we can move libfsimage and/or
libacpi into libs/, where this issue would go away.
---
 tools/libfsimage/common/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile
index 24bc90e73e71..54049ebaae86 100644
--- a/tools/libfsimage/common/Makefile
+++ b/tools/libfsimage/common/Makefile
@@ -1,7 +1,7 @@
 XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/libfsimage/Rules.mk
 
-MAJOR = 4.16
+MAJOR = 4.17
 MINOR = 0
 
 LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS
-- 
2.11.0

On Mon, Dec 13, 2021 at 05:56:33PM +0000, Andrew Cooper wrote:
> Fixes: a5706b80f42e ("Set version to 4.17: rerun autogen.sh")
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> ---
> CC: Wei Liu <wl@xen.org>
> CC: Anthony PERARD <anthony.perard@citrix.com>
> CC: Juergen Gross <jgross@suse.com>
> 
> This gets forgotten each release.  Any chance we can move libfsimage and/or
> libacpi into libs/, where this issue would go away.

libfsimage is a weird kind of library, I don't think it's going to sit
well in libs/, and I don't think moving it just because MAJOR hasn't been
bumped is a good reason...

libacpi isn't a library, not really. It's a collection of source files
designed to be embedded into other programmes.

You know, we could simply replace "4.16" by
    $(shell $(XEN_ROOT)/version.sh $(XEN_ROOT)/xen/Makefile)
then we can forget libfsimage exist.

Any any case,
Acked-by: Anthony PERARD <anthony.perard@citrix.com>
for this patch, or for using version.sh instead.

> ---
>  tools/libfsimage/common/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile
> index 24bc90e73e71..54049ebaae86 100644
> --- a/tools/libfsimage/common/Makefile
> +++ b/tools/libfsimage/common/Makefile
> @@ -1,7 +1,7 @@
>  XEN_ROOT = $(CURDIR)/../../..
>  include $(XEN_ROOT)/tools/libfsimage/Rules.mk
>  
> -MAJOR = 4.16
> +MAJOR = 4.17
>  MINOR = 0
>  
>  LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS

Thanks,

-- 
Anthony PERARD

On 13/12/2021 18:26, Anthony PERARD wrote:
> On Mon, Dec 13, 2021 at 05:56:33PM +0000, Andrew Cooper wrote:
>> Fixes: a5706b80f42e ("Set version to 4.17: rerun autogen.sh")
>> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
>> ---
>> CC: Wei Liu <wl@xen.org>
>> CC: Anthony PERARD <anthony.perard@citrix.com>
>> CC: Juergen Gross <jgross@suse.com>
>>
>> This gets forgotten each release.  Any chance we can move libfsimage and/or
>> libacpi into libs/, where this issue would go away.
> libfsimage is a weird kind of library, I don't think it's going to sit
> well in libs/, and I don't think moving it just because MAJOR hasn't been
> bumped is a good reason...

Honestly, the better reasons is "because it's a library, it ought to
live in libs/ with the rest of them", but yeah, it is weird.  Perhaps
instead we want to tie it to pygrub so people have an easier time of
turning the whole lot off.

>
> libacpi isn't a library, not really. It's a collection of source files
> designed to be embedded into other programmes.

We'd normally call that libacpi.a, and it's perhaps a worthwhile change
to make.

>
> You know, we could simply replace "4.16" by
>     $(shell $(XEN_ROOT)/version.sh $(XEN_ROOT)/xen/Makefile)
> then we can forget libfsimage exist.
>
> Any any case,
> Acked-by: Anthony PERARD <anthony.perard@citrix.com>
> for this patch, or for using version.sh instead.

Good shout.  I'll double check that

MAJOR := $(shell $(XEN_ROOT)/version.sh $(XEN_ROOT)/xen/Makefile)

does the right thing, and commit that version.  One fewer thing to worry
about.

~Andrew