android-tools: fix minor()/major() build failure due to glibc 2.28
PATCH 1/1 android-tools: fix minor()/major() build failure due to glibc 2.28
glibc 2.28 no longer includes <sys/sysmacros.h> from <sys/types.h>, and therefore <sys/sysmacros.h> must be included explicitly when major()/minor() are used.
This commit adds a patch to directly include <sys/sysmacros.h> into all usb_linux.c files where minor() and major() macros are used.
Fixes:
http://autobuild.buildroot.net/results/901/9011c6af71fb81988c2a05f2acee913a2bae2eff//
http://autobuild.buildroot.net/results/142/142c5672fdc44f2d68f18df3509e5051b3295df5//
http://autobuild.buildroot.net/results/b55/b55aa69654e758af5232ae69618ba1ea5c245074//
--- ...smacros.h-to-compile-with-glibc-2.28.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/android-tools/0008-Include-sysmacros.h-to-compile-with-glibc-2.28.patch
package/android-tools/0008-Include-sysmacros.h-to-compile-with-glibc-2.28.patch new file +42 -0
@@ -0,0 +1,42 @@ +usb_linux.c: fix minor()/major() build failure due to glibc 2.28 + +glibc 2.28 no longer includes <sys/sysmacros.h> from <sys/types.h>, +and therefore <sys/sysmacros.h> must be included explicitly when +major()/minor() are used. + +This commit adds a patch to directly include <sys/sysmacros.h> into +all usb_linux.c files where minor() and major() macros are used. + +diff -urpN host-android-tools-4.2.2+git20130218.orig/core/adb/usb_linux.c host-android-tools-4.2.2+git20130218/core/adb/usb_linux.c +--- host-android-tools-4.2.2+git20130218.orig/core/adb/usb_linux.c 2013-02-18 15:49:03.000000000 +0100 ++++ host-android-tools-4.2.2+git20130218/core/adb/usb_linux.c 2018-09-09 11:47:16.476292546 +0200 +@@ -20,6 +20,7 @@ + #include <string.h> + + #include <sys/ioctl.h> ++#include <sys/sysmacros.h> + #include <sys/types.h> + #include <sys/time.h> + #include <dirent.h> +diff -urpN host-android-tools-4.2.2+git20130218.orig/core/adbd/usb_linux.c host-android-tools-4.2.2+git20130218/core/adbd/usb_linux.c +--- host-android-tools-4.2.2+git20130218.orig/core/adbd/usb_linux.c 2018-09-09 02:32:57.154503866 +0200 ++++ host-android-tools-4.2.2+git20130218/core/adbd/usb_linux.c 2018-09-09 11:47:28.148353880 +0200 +@@ -20,6 +20,7 @@ + #include <string.h> + + #include <sys/ioctl.h> ++#include <sys/sysmacros.h> + #include <sys/types.h> + #include <sys/time.h> + #include <dirent.h> +diff -urpN host-android-tools-4.2.2+git20130218.orig/core/fastboot/usb_linux.c host-android-tools-4.2.2+git20130218/core/fastboot/usb_linux.c +--- host-android-tools-4.2.2+git20130218.orig/core/fastboot/usb_linux.c 2013-02-18 15:49:03.000000000 +0100 ++++ host-android-tools-4.2.2+git20130218/core/fastboot/usb_linux.c 2018-09-09 11:46:53.028169154 +0200 +@@ -33,6 +33,7 @@ + + #include <sys/ioctl.h> + #include <sys/stat.h> ++#include <sys/sysmacros.h> + #include <sys/types.h> + #include <dirent.h> + #include <fcntl.h>
Signature · 1 line
2.17.1
Thomas Petazzoni
AppliedPATCH 1/1 android-tools: fix minor()/major() build failure due to glibc 2.28
Hello,
Quoted 12 lines · Giulio Benetti
glibc 2.28 no longer includes <
sys/sysmacros.h> from <sys/types.h>, and therefore <sys/sysmacros.h> must be included explicitly when major()/minor() are used.This commit adds a patch to directly include <
sys/sysmacros.h> into allusb_linux.cfiles whereminor()andmajor()macros are used.Fixes:
http://autobuild.buildroot.net/results/901/9011c6af71fb81988c2a05f2acee913a2bae2eff//
http://autobuild.buildroot.net/results/142/142c5672fdc44f2d68f18df3509e5051b3295df5//
http://autobuild.buildroot.net/results/b55/b55aa69654e758af5232ae69618ba1ea5c245074//
Quoted 5 lines
Signed-off-by Giulio Benetti <[email protected]>--- ...smacros.h-to-compile-with-glibc-2.28.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/android-tools/0008-Include-sysmacros.h-to-compile-with-glibc-2.28.patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 android-tools: fix minor()/major() build failure due to glibc 2.28
Hello,
Il 09/09/2018 15:19, Thomas Petazzoni ha scritto:
Quoted 21 lines
Hello,
Quoted 12 lines · Giulio Benetti
glibc 2.28 no longer includes <
sys/sysmacros.h> from <sys/types.h>, and therefore <sys/sysmacros.h> must be included explicitly when major()/minor() are used.This commit adds a patch to directly include <
sys/sysmacros.h> into allusb_linux.cfiles whereminor()andmajor()macros are used.Fixes:
http://autobuild.buildroot.net/results/901/9011c6af71fb81988c2a05f2acee913a2bae2eff//
http://autobuild.buildroot.net/results/142/142c5672fdc44f2d68f18df3509e5051b3295df5//
http://autobuild.buildroot.net/results/b55/b55aa69654e758af5232ae69618ba1ea5c245074//Quoted 5 lines
Signed-off-by Giulio Benetti <[email protected]>--- ...smacros.h-to-compile-with-glibc-2.28.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+)create mode 100644
package/android-tools/0008-Include-sysmacros.h-to-compile-with-glibc-2.28.patch
Quoted 4 lines
Applied to master, thanks.
Thomas
This can be applied to 2018.02.x too and fixes:
http://autobuild.buildroot.net/results/84da49002f16c9b294ac8c896f53718b90543100/
Signature · 10 lines
Giulio Benetti CTO MICRONOVA SRL Sede: Via A. Niedda 3 - 35010 Vigonza (PD) Tel. 049/8931563 - Fax 049/8931346 Cod.Fiscale - P.IVA 02663420285 Capitale Sociale ? 26.000 i.v. Iscritta al Reg. Imprese di Padova N. 02663420285 Numero R.E.A. 258642
PATCH 1/1 android-tools: fix minor()/major() build failure due to glibc 2.28
In reply to Giulio BenettiQuoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Giulio" == Giulio Benetti <[email protected]> writes:
glibc 2.28 no longer includes <
sys/sysmacros.h> from <sys/types.h>, and therefore <sys/sysmacros.h> must be included explicitly when major()/minor() are used.This commit adds a patch to directly include <
sys/sysmacros.h> into allusb_linux.cfiles whereminor()andmajor()macros are used.
Quoted 6 lines
Fixes:
http://autobuild.buildroot.net/results/901/9011c6af71fb81988c2a05f2acee913a2bae2eff//
http://autobuild.buildroot.net/results/142/142c5672fdc44f2d68f18df3509e5051b3295df5//
http://autobuild.buildroot.net/results/b55/b55aa69654e758af5232ae69618ba1ea5c245074//Signed-off-by Giulio Benetti <[email protected]>
Committed to 2018.02.x, 2018.05.x and 2018.08.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard