From 293f5a93b77d92fd65db7f3d0df654f102e46cfb Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sun, 11 Dec 2016 16:04:20 -0800
Subject: Move to flat package hierarchy

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
---
 extra/libusb/config.h | 38 --------------------------------------
 extra/libusb/gen.rc   | 14 --------------
 extra/libusb/rev      |  1 -
 extra/libusb/src      |  1 -
 4 files changed, 54 deletions(-)
 delete mode 100644 extra/libusb/config.h
 delete mode 100644 extra/libusb/gen.rc
 delete mode 100644 extra/libusb/rev
 delete mode 160000 extra/libusb/src

(limited to 'extra/libusb')

diff --git a/extra/libusb/config.h b/extra/libusb/config.h
deleted file mode 100644
index 64bd7839..00000000
--- a/extra/libusb/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#include <config-posix.h>
-
-#define DEFAULT_VISIBILITY __attribute__((visibility("default")))
-/* #undef ENABLE_DEBUG_LOGGING */
-#define ENABLE_LOGGING 1
-#define HAVE_ASM_TYPES_H 1
-/* #undef HAVE_LIBUDEV */
-/* #undef HAVE_LIBUDEV_H */
-#define HAVE_LINUX_NETLINK_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_SYSLOG_FUNC 1
-#define LT_OBJDIR ".libs/"
-/* #undef OS_DARWIN */
-/* #undef OS_HAIKU */
-#define OS_LINUX 1
-/* #undef OS_NETBSD */
-/* #undef OS_OPENBSD */
-/* #undef OS_SUNOS */
-/* #undef OS_WINDOWS */
-#define PACKAGE "libusb"
-#define PACKAGE_BUGREPORT "libusb-devel@lists.sourceforge.net"
-#define PACKAGE_NAME "libusb"
-#define PACKAGE_STRING "libusb 1.0.21"
-#define PACKAGE_TARNAME "libusb"
-#define PACKAGE_URL "http://libusb.info"
-#define PACKAGE_VERSION "1.0.21"
-#define POLL_NFDS_TYPE nfds_t
-#define THREADS_POSIX 1
-#define USBI_TIMERFD_AVAILABLE 1
-/* #undef USE_SYSTEM_LOGGING_FACILITY */
-/* #undef USE_UDEV */
-/* #undef USE_USBDK */
-#define VERSION "1.0.21"
-/* #undef WINVER */
-#define _GNU_SOURCE 1
-#ifndef __cplusplus
-/* #undef inline */
-#endif
diff --git a/extra/libusb/gen.rc b/extra/libusb/gen.rc
deleted file mode 100644
index e57cdd13..00000000
--- a/extra/libusb/gen.rc
+++ /dev/null
@@ -1,14 +0,0 @@
-cflags\
-	-I include\
-	-I '$dir' \
-	-I '$srcdir'/libusb
-
-build '$outdir'/include/libusb.h copy '$srcdir'/libusb/libusb.h
-phony headers '$outdir'/include/libusb.h
-
-lib libusb-1.0.a libusb/^(\
-	core.c descriptor.c hotplug.c io.c strerror.c sync.c\
-	os/^(poll_posix.c threads_posix.c linux_usbfs.c linux_netlink.c)\
-)
-
-fetch git
diff --git a/extra/libusb/rev b/extra/libusb/rev
deleted file mode 100644
index 0cfbf088..00000000
--- a/extra/libusb/rev
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/extra/libusb/src b/extra/libusb/src
deleted file mode 160000
index 09e75e98..00000000
--- a/extra/libusb/src
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 09e75e98b4d9ea7909e8837b7a3f00dda4589dc3
-- 
cgit v1.2.3