From 09a165b7c58f6df57adca67701eb928eef2f7ad8 Mon Sep 17 00:00:00 2001
From: Christopher Larson <chris_larson@mentor.com>
Date: Wed, 24 Aug 2022 04:00:00 +0500
Subject: [PATCH] glibc-external: explicitly list sys headers and do not
 package acl.h

acl.h comes from the acl recipe, so we should let it provide it.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 recipes-external/glibc/glibc-external.bb      |  2 +-
 .../glibc/glibc-external/libc.headers         | 82 +++++++++++++++++++
 2 files changed, 83 insertions(+), 1 deletion(-)

diff --git a/recipes-external/glibc/glibc-external.bb b/recipes-external/glibc/glibc-external.bb
index 749d0fe..7f0b7c6 100644
--- a/recipes-external/glibc/glibc-external.bb
+++ b/recipes-external/glibc/glibc-external.bb
@@ -203,7 +203,7 @@ FILES:${PN}-dev:remove := "${datadir}/aclocal"
 FILES:${PN}-dev:remove = "/lib/*.o"
 FILES:${PN}-dev += "${libdir}/*crt*.o"
 
-linux_include_subdirs = "asm asm-generic bits drm linux mtd rdma sound sys video"
+linux_include_subdirs = "asm asm-generic bits drm linux mtd rdma sound video"
 FILES:${PN}-dev += "${@' '.join('${includedir}/%s' % d for d in '${linux_include_subdirs}'.split())}"
 
 # Already multilib headers for oe sdks
diff --git a/recipes-external/glibc/glibc-external/libc.headers b/recipes-external/glibc/glibc-external/libc.headers
index d06a251..76615e6 100644
--- a/recipes-external/glibc/glibc-external/libc.headers
+++ b/recipes-external/glibc/glibc-external/libc.headers
@@ -105,6 +105,88 @@ stdlib.h
 string.h
 strings.h
 stropts.h
+sys/acct.h
+sys/auxv.h
+sys/bitypes.h
+sys/capability.h
+sys/cdefs.h
+sys/dir.h
+sys/elf.h
+sys/epoll.h
+sys/errno.h
+sys/eventfd.h
+sys/fanotify.h
+sys/fcntl.h
+sys/file.h
+sys/fsuid.h
+sys/gmon.h
+sys/gmon_out.h
+sys/ifunc.h
+sys/inotify.h
+sys/ioctl.h
+sys/io.h
+sys/ipc.h
+sys/kd.h
+sys/klog.h
+sys/mman.h
+sys/mount.h
+sys/msg.h
+sys/mtio.h
+sys/param.h
+sys/pci.h
+sys/personality.h
+sys/poll.h
+sys/prctl.h
+sys/procfs.h
+sys/profil.h
+sys/psx_syscall.h
+sys/ptrace.h
+sys/queue.h
+sys/quota.h
+sys/random.h
+sys/raw.h
+sys/reboot.h
+sys/reg.h
+sys/resource.h
+sys/rseq.h
+sys/select.h
+sys/sem.h
+sys/sendfile.h
+sys/shm.h
+sys/signal.h
+sys/signalfd.h
+sys/single_threaded.h
+sys/socket.h
+sys/socketvar.h
+sys/soundcard.h
+sys/stat.h
+sys/statfs.h
+sys/statvfs.h
+sys/swap.h
+sys/syscall.h
+sys/sysinfo.h
+sys/syslog.h
+sys/sysmacros.h
+sys/termios.h
+sys/time.h
+sys/timeb.h
+sys/timerfd.h
+sys/times.h
+sys/timex.h
+sys/ttychars.h
+sys/ttydefaults.h
+sys/types.h
+sys/ucontext.h
+sys/uio.h
+sys/un.h
+sys/unistd.h
+sys/user.h
+sys/utsname.h
+sys/vfs.h
+sys/vlimit.h
+sys/vt.h
+sys/wait.h
+sys/xattr.h
 syscall.h
 sysexits.h
 syslog.h