mirror of
https://github.com/oasislinux/oasis.git
synced 2026-02-05 11:33:57 +01:00
293f5a93b7
Note to self: never try to move submodules again
To migrate your existing submodules (more or less):
set -x
set -e
mkdir .git/modules/pkg
for old in */*/src ; do
new="pkg/${old#*/}"
if ! [ -f "$old/.git" ] || [ "${old%%/*}" = pkg ] ; then
continue
fi
git -C ".git/modules/$old" config core.worktree "../../../../../$new"
rmdir "$new"
mv "$old" "$new"
sed -e "s,$old,$new," "$new/.git" > "$new/.git.tmp"
mv "$new/.git.tmp" "$new/.git"
mkdir ".git/modules/${new%/src}"
mv ".git/modules/$old" ".git/modules/$new"
rm "${old%/src}"/*.ninja
mv "${old%/src}"/*.tar.{gz,xz,bz2} "${new%/src}/"
rmdir "${old%/src}" || true
done
sed -e 's,^\[submodule "[^/]*/,[submodule "pkg/,' .git/config > .git/config.tmp
mv .git/config.tmp .git/config
179 lines
4.5 KiB
Diff
179 lines
4.5 KiB
Diff
From 005c1bcf8cd87091af1106b85fb6cd39cac819ab Mon Sep 17 00:00:00 2001
|
|
From: Michael Forney <mforney@mforney.org>
|
|
Date: Fri, 1 Jul 2016 20:08:30 -0700
|
|
Subject: [PATCH] Fix poll.h includes
|
|
|
|
---
|
|
aserver/aserver.c | 2 +-
|
|
include/asoundlib-head.h | 2 +-
|
|
include/local.h | 2 +-
|
|
src/control/control.c | 2 +-
|
|
src/control/control_shm.c | 2 +-
|
|
src/pcm/pcm.c | 2 +-
|
|
src/pcm/pcm_direct.c | 2 +-
|
|
src/pcm/pcm_mmap.c | 2 +-
|
|
src/pcm/pcm_share.c | 2 +-
|
|
src/pcm/pcm_shm.c | 2 +-
|
|
src/seq/seq.c | 2 +-
|
|
src/shmarea.c | 2 +-
|
|
12 files changed, 12 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/aserver/aserver.c b/aserver/aserver.c
|
|
index ac20706..46f731a 100644
|
|
--- a/aserver/aserver.c
|
|
+++ b/aserver/aserver.c
|
|
@@ -20,7 +20,7 @@
|
|
|
|
#include <sys/shm.h>
|
|
#include <sys/socket.h>
|
|
-#include <sys/poll.h>
|
|
+#include <poll.h>
|
|
#include <sys/un.h>
|
|
#include <sys/uio.h>
|
|
#include <stdio.h>
|
|
diff --git a/include/asoundlib-head.h b/include/asoundlib-head.h
|
|
index 1ec611e..21e32c6 100644
|
|
--- a/include/asoundlib-head.h
|
|
+++ b/include/asoundlib-head.h
|
|
@@ -35,6 +35,6 @@
|
|
#include <string.h>
|
|
#include <fcntl.h>
|
|
#include <assert.h>
|
|
-#include <sys/poll.h>
|
|
+#include <poll.h>
|
|
#include <errno.h>
|
|
#include <stdarg.h>
|
|
diff --git a/include/local.h b/include/local.h
|
|
index 317f2e3..6a43a47 100644
|
|
--- a/include/local.h
|
|
+++ b/include/local.h
|
|
@@ -47,7 +47,7 @@
|
|
#error Header defining endianness not defined
|
|
#endif
|
|
#include <stdarg.h>
|
|
-#include <sys/poll.h>
|
|
+#include <poll.h>
|
|
#include <sys/types.h>
|
|
#include <errno.h>
|
|
#if defined(__linux__)
|
|
diff --git a/src/control/control.c b/src/control/control.c
|
|
index 6c00b8e..fd0c303 100644
|
|
--- a/src/control/control.c
|
|
+++ b/src/control/control.c
|
|
@@ -90,7 +90,7 @@ I/O operations.
|
|
#include <string.h>
|
|
#include <fcntl.h>
|
|
#include <signal.h>
|
|
-#include <sys/poll.h>
|
|
+#include <poll.h>
|
|
#include <stdbool.h>
|
|
#include "control_local.h"
|
|
|
|
diff --git a/src/control/control_shm.c b/src/control/control_shm.c
|
|
index bd07d4a..9a2e268 100644
|
|
--- a/src/control/control_shm.c
|
|
+++ b/src/control/control_shm.c
|
|
@@ -27,7 +27,7 @@
|
|
#include <fcntl.h>
|
|
#include <sys/shm.h>
|
|
#include <sys/socket.h>
|
|
-#include <sys/poll.h>
|
|
+#include <poll.h>
|
|
#include <sys/un.h>
|
|
#include <sys/uio.h>
|
|
#include <sys/mman.h>
|
|
diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c
|
|
index f832399..e9d502a 100644
|
|
--- a/src/pcm/pcm.c
|
|
+++ b/src/pcm/pcm.c
|
|
@@ -650,7 +650,7 @@ playback devices.
|
|
#include <stdarg.h>
|
|
#include <signal.h>
|
|
#include <ctype.h>
|
|
-#include <sys/poll.h>
|
|
+#include <poll.h>
|
|
#include <sys/mman.h>
|
|
#include <limits.h>
|
|
#include "pcm_local.h"
|
|
diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c
|
|
index c3925cc..18f1dd5 100644
|
|
--- a/src/pcm/pcm_direct.c
|
|
+++ b/src/pcm/pcm_direct.c
|
|
@@ -30,7 +30,7 @@
|
|
#include <grp.h>
|
|
#include <sys/ioctl.h>
|
|
#include <sys/mman.h>
|
|
-#include <sys/poll.h>
|
|
+#include <poll.h>
|
|
#include <sys/shm.h>
|
|
#include <sys/sem.h>
|
|
#include <sys/wait.h>
|
|
diff --git a/src/pcm/pcm_mmap.c b/src/pcm/pcm_mmap.c
|
|
index 1948289..4cf220a 100644
|
|
--- a/src/pcm/pcm_mmap.c
|
|
+++ b/src/pcm/pcm_mmap.c
|
|
@@ -22,7 +22,7 @@
|
|
#include <stdio.h>
|
|
#include <malloc.h>
|
|
#include <string.h>
|
|
-#include <sys/poll.h>
|
|
+#include <poll.h>
|
|
#include <sys/mman.h>
|
|
#ifdef HAVE_SYS_SHM_H
|
|
#include <sys/shm.h>
|
|
diff --git a/src/pcm/pcm_share.c b/src/pcm/pcm_share.c
|
|
index 5d8aaf2..21a57fc 100644
|
|
--- a/src/pcm/pcm_share.c
|
|
+++ b/src/pcm/pcm_share.c
|
|
@@ -34,7 +34,7 @@
|
|
#include <signal.h>
|
|
#include <math.h>
|
|
#include <sys/socket.h>
|
|
-#include <sys/poll.h>
|
|
+#include <poll.h>
|
|
#include <pthread.h>
|
|
#include "pcm_local.h"
|
|
|
|
diff --git a/src/pcm/pcm_shm.c b/src/pcm/pcm_shm.c
|
|
index a815ac6..4ee958c 100644
|
|
--- a/src/pcm/pcm_shm.c
|
|
+++ b/src/pcm/pcm_shm.c
|
|
@@ -36,7 +36,7 @@
|
|
#include <sys/ioctl.h>
|
|
#include <sys/shm.h>
|
|
#include <sys/socket.h>
|
|
-#include <sys/poll.h>
|
|
+#include <poll.h>
|
|
#include <sys/un.h>
|
|
#include <sys/mman.h>
|
|
#include <netinet/in.h>
|
|
diff --git a/src/seq/seq.c b/src/seq/seq.c
|
|
index 9279830..d2027cb 100644
|
|
--- a/src/seq/seq.c
|
|
+++ b/src/seq/seq.c
|
|
@@ -777,7 +777,7 @@ void event_filter(snd_seq_t *seq, snd_seq_event_t *ev)
|
|
|
|
*/
|
|
|
|
-#include <sys/poll.h>
|
|
+#include <poll.h>
|
|
#include "seq_local.h"
|
|
|
|
/****************************************************************************
|
|
diff --git a/src/shmarea.c b/src/shmarea.c
|
|
index 9843aa8..eaa71f0 100644
|
|
--- a/src/shmarea.c
|
|
+++ b/src/shmarea.c
|
|
@@ -27,7 +27,7 @@
|
|
#include <malloc.h>
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
-#include <sys/poll.h>
|
|
+#include <poll.h>
|
|
#include <sys/mman.h>
|
|
#include <sys/shm.h>
|
|
#include "list.h"
|
|
--
|
|
2.9.2
|
|
|