logo

live-bootstrap

Mirror of <https://github.com/fosslinux/live-bootstrap>

headers.patch (4271B)

    

  1. SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
  3. SPDX-License-Identifier: LGPL-2.0-or-later
  5. Musl utilizes the (correct) sys/sysmacros.h for major/minor macros. However,
  6. older glibc used to not do this. Hence this older util-linux assumes that 
  7. behaviour which is wrong. So we need to patch in this include.
  9. Some function was moved to sys/param.h at a later date so we include that for
  10. ttymsg.
  12. (This is the main patch file. See -bsd.patch for files with such licensing).
  14. diff --color -ru shlibs/blkid/src/devname.c shlibs/blkid/src/devname.c
  15. --- util-linux-2.19.1/shlibs/blkid/src/devname.c	2021-06-12 14:24:30.982387640 +1000
  16. +++ util-linux-2.19.1/shlibs/blkid/src/devname.c	2021-06-12 14:25:42.934921608 +1000
  17. @@ -33,6 +33,7 @@
  18.  #include <errno.h>
  19.  #endif
  20.  #include <time.h>
  21. +#include <sys/sysmacros.h>
  22.  
  23.  #include "blkidP.h"
  24.  
  25. diff --color -ru shlibs/blkid/src/devno.c shlibs/blkid/src/devno.c
  26. --- util-linux-2.19.1/shlibs/blkid/src/devno.c	2021-06-12 14:24:30.987387677 +1000
  27. +++ util-linux-2.19.1/shlibs/blkid/src/devno.c	2021-06-12 14:25:27.750808925 +1000
  28. @@ -31,6 +31,7 @@
  29.  #endif
  30.  #include <fcntl.h>
  31.  #include <inttypes.h>
  32. +#include <sys/sysmacros.h>
  33.  
  34.  #include "blkidP.h"
  35.  #include "pathnames.h"
  36. diff --color -ru shlibs/blkid/src/partitions/partitions.c shlibs/blkid/src/partitions/partitions.c
  37. --- util-linux-2.19.1/shlibs/blkid/src/partitions/partitions.c	2021-06-12 14:24:30.983387647 +1000
  38. +++ util-linux-2.19.1/shlibs/blkid/src/partitions/partitions.c	2021-06-12 14:25:24.326783515 +1000
  39. @@ -19,6 +19,7 @@
  40.  #include <stdint.h>
  41.  #include <inttypes.h>
  42.  #include <stdarg.h>
  43. +#include <sys/sysmacros.h>
  44.  
  45.  #include "partitions.h"
  46.  
  47. diff --color -ru shlibs/blkid/src/topology/evms.c shlibs/blkid/src/topology/evms.c
  48. --- util-linux-2.19.1/shlibs/blkid/src/topology/evms.c	2021-06-12 14:24:30.984387655 +1000
  49. +++ util-linux-2.19.1/shlibs/blkid/src/topology/evms.c	2021-06-12 14:25:30.390828517 +1000
  50. @@ -19,6 +19,7 @@
  51.  #include <sys/stat.h>
  52.  #include <sys/types.h>
  53.  #include <unistd.h>
  54. +#include <sys/sysmacros.h>
  55.  
  56.  #include "topology.h"
  57.  
  58. diff --color -ru shlibs/blkid/src/topology/lvm.c shlibs/blkid/src/topology/lvm.c
  59. --- util-linux-2.19.1/shlibs/blkid/src/topology/lvm.c	2021-06-12 14:24:30.984387655 +1000
  60. +++ util-linux-2.19.1/shlibs/blkid/src/topology/lvm.c	2021-06-12 14:25:37.510881355 +1000
  61. @@ -18,6 +18,7 @@
  62.  #include <sys/stat.h>
  63.  #include <sys/types.h>
  64.  #include <unistd.h>
  65. +#include <sys/sysmacros.h>
  66.  
  67.  #include "topology.h"
  68.  
  69. diff --color -ru shlibs/blkid/src/topology/md.c shlibs/blkid/src/topology/md.c
  70. --- util-linux-2.19.1/shlibs/blkid/src/topology/md.c	2021-06-12 14:24:30.984387655 +1000
  71. +++ util-linux-2.19.1/shlibs/blkid/src/topology/md.c	2021-06-12 14:25:34.679860346 +1000
  72. @@ -19,6 +19,7 @@
  73.  #include <sys/stat.h>
  74.  #include <sys/types.h>
  75.  #include <unistd.h>
  76. +#include <sys/sysmacros.h>
  77.  
  78.  #include "topology.h"
  79.  
  80. --- util-linux-2.19.1/shlibs/blkid/src/topology/dm.c	2021-06-12 14:29:01.195392922 +1000
  81. +++ util-linux-2.19.1/shlibs/blkid/src/topology/dm.c	2021-06-12 14:29:05.897427816 +1000
  82. @@ -18,6 +18,7 @@
  83.  #include <sys/stat.h>
  84.  #include <sys/types.h>
  85.  #include <unistd.h>
  86. +#include <sys/sysmacros.h>
  87.  
  88.  #include "topology.h"
  89.  
  90. diff --color -ru shlibs/blkid/src/evaluate.c shlibs/blkid/src/evaluate.c
  91. --- util-linux-2.19.1/shlibs/blkid/src/evaluate.c	2021-06-12 16:11:45.893958255 +1000
  92. +++ util-linux-2.19.1/shlibs/blkid/src/evaluate.c	2021-06-12 16:12:20.652202397 +1000
  93. @@ -21,6 +21,7 @@
  94.  #endif
  95.  #include <stdint.h>
  96.  #include <stdarg.h>
  97. +#include <sys/sysmacros.h>
  98.  
  99.  #include "pathnames.h"
  100.  #include "canonicalize.h"
  101. diff --color -ru shlibs/mount/src/fs.c shlibs/mount/src/fs.c
  102. --- util-linux-2.19.1/shlibs/mount/src/fs.c	2021-06-12 16:11:45.897958283 +1000
  103. +++ util-linux-2.19.1/shlibs/mount/src/fs.c	2021-06-12 16:12:14.812161377 +1000
  104. @@ -18,6 +18,7 @@
  105.  #include <errno.h>
  106.  #include <blkid.h>
  107.  #include <stddef.h>
  108. +#include <sys/sysmacros.h>
  109.  
  110.  #include "nls.h"
  111.  #include "mountP.h"
  112. --- util-linux-2.19.1/shlibs/mount/src/tab_parse.c	2021-06-12 19:04:38.773393353 +1000
  113. +++ util-linux-2.19.1/shlibs/mount/src/tab_parse.c	2021-06-12 19:04:51.115474555 +1000
  114. @@ -14,6 +14,7 @@
  115.  #include <dirent.h>
  116.  #include <fcntl.h>
  117.  #include <unistd.h>
  118. +#include <sys/sysmacros.h>
  119.  
  120.  #include "nls.h"
  121.  #include "at.h"