From b87d00738674efb9a7636c986ef07cfb63b8e55c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98rjan=20Malde?= <red@foxi.me>
Date: Thu, 4 Jun 2020 21:15:11 +0200
Subject: ubase: disable utilities relying on sys/mount.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>
---
 patches/ubase.local.patch    | 13 +++++++++++++
 patches/ubase/Makefile.patch | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 patches/ubase/Makefile.patch

diff --git a/patches/ubase.local.patch b/patches/ubase.local.patch
index c95cfba0..d325f000 100644
--- a/patches/ubase.local.patch
+++ b/patches/ubase.local.patch
@@ -7,3 +7,16 @@ diff -ru ubase.orig/config.mk ubase/config.mk
  LDLIBS   = -lcrypt
 -LDFLAGS  = -s
 +LDFLAGS  =
+diff -ru ubase.orig/dd.c ubase/dd.c
+--- ubase.orig/dd.c     2019-02-20 15:52:28.200075816 +0100
++++ ubase/dd.c  2020-06-04 16:17:53.711291738 +0200
+@@ -7,7 +7,9 @@
+  * version of the code has been modified by sin@2f30.org.
+  */
+ #include <sys/ioctl.h>
++#ifdef __midipix__
+ #include <sys/mount.h>
++#endif
+ #include <sys/stat.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
diff --git a/patches/ubase/Makefile.patch b/patches/ubase/Makefile.patch
new file mode 100644
index 00000000..837b9f8e
--- /dev/null
+++ b/patches/ubase/Makefile.patch
@@ -0,0 +1,40 @@
+diff -ru ubase.orig/Makefile ubase/Makefile
+--- ubase.orig/Makefile	2020-06-04 16:28:46.959510474 +0200
++++ ubase/Makefile	2020-06-04 16:34:28.406481119 +0200
+@@ -37,17 +37,14 @@
+ LIB = $(LIBUTIL)
+ 
+ BIN = \
+-	blkdiscard        \
+ 	chvt              \
+ 	clear             \
+ 	ctrlaltdel        \
+-	dd                \
+ 	df                \
+ 	dmesg             \
+ 	eject             \
+ 	fallocate         \
+ 	free              \
+-	freeramdisk       \
+ 	fsfreeze          \
+ 	getty             \
+ 	halt              \
+@@ -63,7 +60,6 @@
+ 	mesg              \
+ 	mknod             \
+ 	mkswap            \
+-	mount             \
+ 	mountpoint        \
+ 	nologin           \
+ 	pagesize          \
+@@ -80,10 +76,8 @@
+ 	swaplabel         \
+ 	swapoff           \
+ 	swapon            \
+-	switch_root       \
+ 	sysctl            \
+ 	truncate          \
+-	umount            \
+ 	unshare           \
+ 	uptime            \
+ 	vtallow           \
-- 
cgit v1.2.3