linux-libc-dev-common: New package

4 files changed, 18 insertions, 4 deletions

diff --git a/build b/build
index 4c22295..870164f 100755
--- a/build
+++ b/build
@@ -53,11 +53,11 @@ install: build
 			linux-image.data/etc/kernel/postrm.d; \
 	fi
 	oh-autoinstall -T headers_install -- \
-		INSTALL_HDR_PATH="$${PWD}/linux-libc-dev.data/usr"
-	find linux-libc-dev.data/usr/include \
+		INSTALL_HDR_PATH="$${PWD}/linux-libc-dev-common.data/usr"
+	find linux-libc-dev-common.data/usr/include \
 		\( -name .install -o -name ..install.cmd \
 		-o -name .check -o -name ..check.cmd \) \
 		-a -exec rm -f '{}' ';'
 	mkdir linux-libc-dev.data/usr/include/$(OPK_HOST_ARCH)
-	mv linux-libc-dev.data/usr/include/asm \
+	mv linux-libc-dev-common.data/usr/include/asm \
 		linux-libc-dev.data/usr/include/$(OPK_HOST_ARCH)/asm
diff --git a/changelog b/changelog
index 11d0f13..70a6b6c 100644
--- a/changelog
+++ b/changelog
@@ -15,6 +15,7 @@ linux-libre-4.19 (4.19.56+gnu-1) trunk
   * Add libncurses.6-dev and terminfo to Build-Depends for convenience when
     building and running upstream mconf (menuconfig).
   * Organize packages into sections.
+    - Split architecture-independent headers into new linux-libc-dev package.
 
  -- Patrick McDermott <patrick.mcdermott@libiquity.com>  Fri, 28 Jun 2019 18:50:56 -0400
 
diff --git a/linux-libc-dev-common.pkg/control b/linux-libc-dev-common.pkg/control
new file mode 100644
index 0000000..457fea8
--- /dev/null
+++ b/linux-libc-dev-common.pkg/control
@@ -0,0 +1,11 @@
+Architecture: all
+Platform: all
+Section: share
+Depends: linux-common (= ${Source-Version})
+Description: Linux support headers for userspace development - arch-independent
+ This package provides headers that define interfaces for userspace libraries
+ and programs.  These headers are used by BusyBox and the C library, for
+ example.
+ .
+ This package provides only the architecture-independent Linux header files.
+ For a complete set of Linux headers, install linux-libc-dev.
diff --git a/linux-libc-dev.pkg/control b/linux-libc-dev.pkg/control
index 7ffb119..ed84f5a 100644
--- a/linux-libc-dev.pkg/control
+++ b/linux-libc-dev.pkg/control
@@ -1,6 +1,8 @@
 Architecture: any-linux-any
 Platform: all
-Depends: linux-common (= ${Source-Version})
+Section: libdev
+Depends: linux-common (= ${Source-Version}),
+ linux-libc-dev-common (= ${Source-Version}),
 Description: Linux support headers for userspace development
  This package provides headers that define interfaces for userspace libraries
  and programs.  These headers are used by BusyBox and the C library, for