From 1a7a75c4b902204206788dda28edb9404cd6d3a3 Mon Sep 17 00:00:00 2001
From: Andrew Rynhard <andrew@andrewrynhard.com>
Date: Fri, 11 Oct 2019 22:35:59 +0000
Subject: [PATCH] feat: upgrade musl to 1.1.24

Signed-off-by: Andrew Rynhard <andrew@andrewrynhard.com>
---
 base/pkg.yaml                     |  2 +-
 kernel/pkg.yaml                   |  2 +-
 musl/pkg.yaml                     | 56 +++++++++++++++----------------
 syslinux/patches/sys-macros.patch | 32 ++++++++++++++++++
 syslinux/pkg.yaml                 |  2 ++
 5 files changed, 64 insertions(+), 30 deletions(-)
 create mode 100644 syslinux/patches/sys-macros.patch

diff --git a/base/pkg.yaml b/base/pkg.yaml
index b151a95c..d1d75a90 100644
--- a/base/pkg.yaml
+++ b/base/pkg.yaml
@@ -2,7 +2,7 @@ name: base
 variant: scratch
 shell: /toolchain/bin/bash
 dependencies:
-  - image: docker.io/autonomy/tools:b4e3778
+  - image: docker.io/autonomy/tools:7de4db2
   - stage: musl
 steps:
   - prepare:
diff --git a/kernel/pkg.yaml b/kernel/pkg.yaml
index 62299d46..f06f665e 100644
--- a/kernel/pkg.yaml
+++ b/kernel/pkg.yaml
@@ -2,7 +2,7 @@ name: kernel
 variant: scratch
 shell: /toolchain/bin/bash
 dependencies:
-    - image: docker.io/autonomy/tools:b4e3778
+    - image: docker.io/autonomy/tools:7de4db2
 steps:
     - sources:
           - url: https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.3.6.tar.xz
diff --git a/musl/pkg.yaml b/musl/pkg.yaml
index 481b05da..c04bcc29 100644
--- a/musl/pkg.yaml
+++ b/musl/pkg.yaml
@@ -2,37 +2,37 @@ name: musl
 variant: scratch
 shell: /toolchain/bin/bash
 dependencies:
-- image: docker.io/autonomy/tools:b4e3778
-- stage: ca-certificates
+  - image: docker.io/autonomy/tools:7de4db2
+  - stage: ca-certificates
 steps:
-- sources:
-  - url: https://www.musl-libc.org/releases/musl-1.1.22.tar.gz
-    destination: musl.tar.gz
-    sha256: 8b0941a48d2f980fd7036cfbd24aa1d414f03d9a0652ecbd5ec5c7ff1bee29e3
-    sha512: 08a40d722672504427238e71c9e52a723c6a14735abe9581d6d4bb3f86662d5d51a3f32a6aed6420c1f9680e22a3a554a9b87ae342635be971e2db49cc9fdb87
-  prepare:
-  - |
-    export PATH=${TOOLCHAIN}/cross/bin:${PATH}
+  - sources:
+      - url: https://www.musl-libc.org/releases/musl-1.1.24.tar.gz
+        destination: musl.tar.gz
+        sha256: 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
+        sha512: 8987f1e194ea616f34f4f21fe9def28fb7f81d7060e38619206c6349f79db3bbb76bae8b711f5f9b8ed038799c9aea1a4cbec69e0bc4131e246203e133149e77
+    prepare:
+      - |
+        export PATH=${TOOLCHAIN}/cross/bin:${PATH}
 
-    tar -xzf musl.tar.gz --strip-components=1
+        tar -xzf musl.tar.gz --strip-components=1
 
-    mkdir /bin
-    ln -sv /toolchain/bin/bash /bin/sh
+        mkdir /bin
+        ln -sv /toolchain/bin/bash /bin/sh
 
-    mkdir build
-    cd build
+        mkdir build
+        cd build
 
-    ../configure \
-    --prefix=/ \
-    --syslibdir=/lib \
-  build:
-  - |
-    cd build
-    make -j $(nproc)
-  install:
-  - |
-    cd build
-    make DESTDIR=/rootfs install
+        ../configure \
+        --prefix=/ \
+        --syslibdir=/lib \
+    build:
+      - |
+        cd build
+        make -j $(nproc)
+    install:
+      - |
+        cd build
+        make DESTDIR=/rootfs install
 finalize:
-- from: /rootfs
-  to: /
+  - from: /rootfs
+    to: /
diff --git a/syslinux/patches/sys-macros.patch b/syslinux/patches/sys-macros.patch
new file mode 100644
index 00000000..f6b1385c
--- /dev/null
+++ b/syslinux/patches/sys-macros.patch
@@ -0,0 +1,32 @@
+From 1a74985b2a404639b08882c57f3147229605dfd5 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 19 Apr 2016 06:50:31 -0400
+Subject: extlinux: pull in sys/sysmacros.h for major/minor/makedev
+
+These functions are defined in sys/sysmacros.h, so add the include to
+main.c.  This is already handled correctly in mountinfo.c.  Otherwise
+we get build failures like:
+
+main.o: In function 'find_device_sysfs':
+extlinux/main.c:1131: undefined reference to 'minor'
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
+---
+ extlinux/main.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/extlinux/main.c b/extlinux/main.c
+index a7ebd49a..ebff7eae 100644
+--- a/extlinux/main.c
++++ b/extlinux/main.c
+@@ -38,6 +38,7 @@
+ #include <sysexits.h>
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/mount.h>
+ #include <sys/vfs.h>
+--
+cgit v1.2.1
diff --git a/syslinux/pkg.yaml b/syslinux/pkg.yaml
index fc2ad34d..d374a6ce 100644
--- a/syslinux/pkg.yaml
+++ b/syslinux/pkg.yaml
@@ -15,6 +15,8 @@ steps:
     prepare:
       - |
         tar -xJf syslinux.tar.xz --strip-components=1
+
+        patch -p1 </pkg/patches/sys-macros.patch
     build:
       - |
         make -j $(nproc) installer