Message ID | 1450522892-14611-10-git-send-email-bernd.kuhls@t-online.de |
---|---|
State | Changes Requested |
Headers | show |
Dear Bernd Kuhls, Adding Arnout in Cc, since he is our legacy handling expert :) On Sat, 19 Dec 2015 12:01:30 +0100, Bernd Kuhls wrote: > - added legacy handling for BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17 Is this really needed? In any case, without legacy handling, the thing will automatically fall back to version 1.18, which is what we want. So I'm questioning whether legacy handling is needed. > - legacy handling for BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 > is not needed because this option is not used by other packages BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 is a blind option, so there is no point in adding legacy handling for it. > +config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17 > + bool "xserver_xorg-server package was bumped to 1.18" > + select BR2_LEGACY > + select BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_18 Doing a "select" on an item of a choice doesn't work. See the commit from Arnout about this: https://git.busybox.net/buildroot/commit/?id=94d403d709eb5d0c487630b2eb651932bb488470. > diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in > index 84f0298..3e31dc7 100644 > --- a/package/x11r7/xserver_xorg-server/Config.in > +++ b/package/x11r7/xserver_xorg-server/Config.in > @@ -64,14 +64,14 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 > config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI > int > default 14 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14 > - default 19 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 > + default 20 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_20 I don't see where you are adding the definition of the option BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_20. I'll mark this patch (and the nouveau patch) as Changes Requested in patchwork. I don't really have any comments on the nouveau patch, but since I assumed it depended on this one, I didn't apply it. Can you resend both once the xserver bump issues are resolved ? Thanks a lot! Thomas
On 19-12-15 14:17, Thomas Petazzoni wrote: > Dear Bernd Kuhls, > > Adding Arnout in Cc, since he is our legacy handling expert :) > > On Sat, 19 Dec 2015 12:01:30 +0100, Bernd Kuhls wrote: >> - added legacy handling for BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17 > > Is this really needed? In any case, without legacy handling, the thing > will automatically fall back to version 1.18, which is what we want. So > I'm questioning whether legacy handling is needed. I would normally say that we should still have legacy handling here, to draw people's attention to the fact that something in the .config changed. However, it's just a change of version, and versions are changing all over the place, so indeed legacy handling isn't needed here. Regards, Arnout > >> - legacy handling for BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 >> is not needed because this option is not used by other packages > > BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 is a blind option, so > there is no point in adding legacy handling for it. [snip]
Arnout, On Sat, 19 Dec 2015 15:12:16 +0100, Arnout Vandecappelle wrote: > I would normally say that we should still have legacy handling here, to draw > people's attention to the fact that something in the .config changed. However, > it's just a change of version, and versions are changing all over the place, so > indeed legacy handling isn't needed here. As you say, we're bumping versions of tons of packages all the time, without notifying users each time (it would be horrible), so why should we do it specifically for the X.org server ? Especially when the user has chosen to use the "tip" (1.17) and we're just updating to the more recent "tip". If we were to remove the 1.14 version, which is kept so far only for compatibility with old NVidia X.org drivers, then maybe we should do legacy handling (and even I'm not sure, because if we are to remove this version, it means that we would have upgraded the NVidia drivers to a version that works fine with a more recent X.org server). Too much legacy handling is not good IMO. Thomas
diff --git a/Config.in.legacy b/Config.in.legacy index e1ea06f..1ebfe07 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -107,6 +107,13 @@ endif ############################################################################### comment "Legacy options removed in 2016.02" +config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17 + bool "xserver_xorg-server package was bumped to 1.18" + select BR2_LEGACY + select BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_18 + help + xserver_xorg-server package was bumped to 1.18 + config BR2_PACKAGE_LIBEINA bool "libeina package has been removed" select BR2_LEGACY diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index 84f0298..3e31dc7 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -64,14 +64,14 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI int default 14 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14 - default 19 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 + default 20 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_20 choice bool "X Window System server version" -config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17 - bool "1.17.4" - select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 +config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_18 + bool "1.18.0" + select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_20 select BR2_PACKAGE_XPROTO_PRESENTPROTO config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14 @@ -82,7 +82,7 @@ endchoice config BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION string - default "1.17.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17 + default "1.18.0" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_18 default "1.14.7" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14 choice diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 0119e37..72c00c4 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,6 +1,6 @@ # From http://lists.x.org/archives/xorg-announce/2014-June/002440.html sha1 7a95765e56b124758fcd7b609589e65b8870880b xorg-server-1.14.7.tar.bz2 sha256 fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f xorg-server-1.14.7.tar.bz2 -# From http://lists.x.org/archives/xorg-announce/2015-October/002650.html -sha1 139c4d6795eb4c3848616cc514d134532975e49e xorg-server-1.17.4.tar.bz2 -sha256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 xorg-server-1.17.4.tar.bz2 +# From http://lists.x.org/archives/xorg-announce/2015-November/002655.html +sha1 f37f9ca17d211552c775c3ce78ff03385026bf3a xorg-server-1.18.0.tar.bz2 +sha256 195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e xorg-server-1.18.0.tar.bz2
- added legacy handling for BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17 - legacy handling for BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 is not needed because this option is not used by other packages Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- Config.in.legacy | 7 +++++++ package/x11r7/xserver_xorg-server/Config.in | 10 +++++----- package/x11r7/xserver_xorg-server/xserver_xorg-server.hash | 6 +++--- 3 files changed, 15 insertions(+), 8 deletions(-)