From f710c0d0c8c6dad6f89abc0cd0d00150459e7c4c Mon Sep 17 00:00:00 2001
From: Dongsu Park <dongsu@kinvolk.io>
Date: Fri, 25 Sep 2020 16:36:18 +0200
Subject: [PATCH] sys-apps/makedev: bring back the package for bootstrap_sdk

The bootstrap_sdk stage still requires `sys-apps/makedev` to be
available, as listed in `profiles/default/linux/packages.build`.
We need to bring it back to make the SDK build work again.

This reverts commit df8159f565972eb31455ff5e4cbfba8c4a12bb52.
---
 .../portage-stable/sys-apps/makedev/Manifest  |  1 +
 .../files/makedev-3.23.1-headers.patch        | 25 +++++++++
 .../sys-apps/makedev/makedev-3.23.1.ebuild    | 52 +++++++++++++++++++
 .../sys-apps/makedev/metadata.xml             |  8 +++
 4 files changed, 86 insertions(+)
 create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/makedev/Manifest
 create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/makedev/files/makedev-3.23.1-headers.patch
 create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/makedev/makedev-3.23.1.ebuild
 create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/makedev/metadata.xml

diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/makedev/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/makedev/Manifest
new file mode 100644
index 0000000000..c0e06474bb
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/makedev/Manifest
@@ -0,0 +1 @@
+DIST MAKEDEV-3.23-1.tar.gz 122613 BLAKE2B 2b0a4a02db36d7a3a71018378396c7d5ac8bbd4e9f8b24a1d3659084f381e8cc686f3d9198dc54e1efd93095ea09c21aab3b9866b942bff8e8a393355403f28a SHA512 5ca82cdcc4544042ede552370acf6266929fa34d177bd8e831573ccc1c57e06ec87766b9e60a686ec1449b204ae0ac3c048eab32b57ce8d610366219d3a77dbc
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/makedev/files/makedev-3.23.1-headers.patch b/sdk_container/src/third_party/portage-stable/sys-apps/makedev/files/makedev-3.23.1-headers.patch
new file mode 100644
index 0000000000..981a80b14e
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/makedev/files/makedev-3.23.1-headers.patch
@@ -0,0 +1,25 @@
+http://bugs.gentoo.org/339674
+
+--- a/sel.h
++++ b/sel.h
+@@ -18,6 +18,7 @@
+  */
+ 
+ #ifdef MAKEDEV_SELINUX
++#include <limits.h>
+ #include <selinux/selinux.h>
+ static char secontextname[PATH_MAX + 2];
+ static char secontextflag[PATH_MAX + 7];
+
+https://bugs.gentoo.org/580500
+
+--- a/MAKEDEV.c
++++ b/MAKEDEV.c
+@@ -17,6 +17,7 @@
+  *
+  */
+ 
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/socket.h>
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/makedev/makedev-3.23.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/makedev/makedev-3.23.1.ebuild
new file mode 100644
index 0000000000..a2b5d6f17d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/makedev/makedev-3.23.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+MY_PN="MAKEDEV"
+MY_VER=${PV%.*}
+MY_REL=${PV#${MY_VER}.}
+MY_P="${MY_PN}-${MY_VER}"
+DESCRIPTION="program used for creating device files in /dev"
+HOMEPAGE="https://people.redhat.com/nalin/MAKEDEV/"
+SRC_URI="https://people.redhat.com/nalin/MAKEDEV/${MY_P}-${MY_REL}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+IUSE="build selinux"
+
+RDEPEND="!<sys-apps/baselayout-2.0.0_rc"
+DEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-headers.patch #339674
+}
+
+src_compile() {
+	use selinux && export SELINUX=1
+	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	# set devdir to makedevdir so we dont have to worry about /dev
+	emake install DESTDIR="${D}" makedevdir=/sbin devdir=/sbin || die
+	dodoc *.txt
+	keepdir /dev
+}
+
+pkg_postinst() {
+	if use build ; then
+		# set up a base set of nodes to make recovery easier #368597
+		"${ROOT}"/sbin/MAKEDEV -c "${ROOT}"/etc/makedev.d \
+			-d "${ROOT}"/dev console hda input ptmx std sd tty
+		# trim useless nodes
+		rm -f "${ROOT}"/dev/fd[0-9]* # floppy
+		rm -f "${ROOT}"/dev/sd[a-d][a-z]* "${ROOT}"/dev/sd[e-z]* # excess sata/scsi
+		rm -f "${ROOT}"/dev/tty[a-zA-Z]* # excess tty
+	fi
+}
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/makedev/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-apps/makedev/metadata.xml
new file mode 100644
index 0000000000..56c1244130
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/makedev/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+</pkgmetadata>