kiss-stj

My KISS Linux repo for software I use on my computers.
git clone https://git.stjo.hn/kiss-stj
Log | Files | Refs | README | LICENSE

commit f5cd3dabfc06aa55631333c15422a46e84b15c66
parent 3fc1b81a2c556b4407b923249cf900662f20c7fb
Author: St John Karp <contact@stjo.hn>
Date:   Fri,  1 Jul 2022 13:56:04 -0400

ubase: Remove package in favour of the one in community

Diffstat:
Dcore/ubase/build | 21---------------------
Dcore/ubase/checksums | 2--
Dcore/ubase/patches/f3aa4b156360ce4a18e4a3897f883b663771ba24.patch | 70----------------------------------------------------------------------
Dcore/ubase/patches/fix-mount.patch | 12------------
Dcore/ubase/sources | 3---
Dcore/ubase/version | 1-
6 files changed, 0 insertions(+), 109 deletions(-)

diff --git a/core/ubase/build b/core/ubase/build @@ -1,21 +0,0 @@ -#!/bin/sh -e - -for patch in *.patch; do - patch -p1 < "$patch" -done - -sed -e "s/^CFLAGS/#CFLAGS/" \ - -e "s/^LDFLAGS/#LDFLAGS/" \ - -e 's/^CC = cc$/#CC = cc/' \ - -e 's/^AR = ar$/#AR = ar/' \ - config.mk > _ -mv _ config.mk -echo "CFLAGS = $CFLAGS -static" >> config.mk -echo "LDFLAGS = $LDFLAGS -static" >> config.mk - -make ubase-box -make DESTDIR="$1" PREFIX=/usr ubase-box-install - -# Remove 'su' which doesn't support '-c'. -#unlink "$1/usr/bin/su" -#unlink "$1/usr/bin/stat" diff --git a/core/ubase/checksums b/core/ubase/checksums @@ -1,2 +0,0 @@ -714715936ff5e8a3574a41031cfbf05d4b061f19fcc07175e717f5db70b7f8e4 -4b2932a50164230b0defd4de008e423babf053bac823930258378b0efee64065 diff --git a/core/ubase/patches/f3aa4b156360ce4a18e4a3897f883b663771ba24.patch b/core/ubase/patches/f3aa4b156360ce4a18e4a3897f883b663771ba24.patch @@ -1,70 +0,0 @@ -From f3aa4b156360ce4a18e4a3897f883b663771ba24 Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Mon, 5 Aug 2019 15:45:17 -0700 -Subject: [PATCH] Include sys/sysmacros.h when major is not defined in - sys/types.h - ---- - libutil/tty.c | 5 ++++- - mknod.c | 3 +++ - mountpoint.c | 3 +++ - stat.c | 3 +++ - 4 files changed, 13 insertions(+), 1 deletion(-) - -diff --git a/libutil/tty.c b/libutil/tty.c -index bceb01e..f56388e 100644 ---- a/libutil/tty.c -+++ b/libutil/tty.c -@@ -1,6 +1,9 @@ - /* See LICENSE file for copyright and license details. */ --#include <sys/types.h> - #include <sys/stat.h> -+#include <sys/types.h> -+#ifndef major -+#include <sys/sysmacros.h> -+#endif - - #include <fcntl.h> - #include <dirent.h> -diff --git a/mknod.c b/mknod.c -index 8de35c7..9dbede7 100644 ---- a/mknod.c -+++ b/mknod.c -@@ -1,6 +1,9 @@ - /* See LICENSE file for copyright and license details. */ - #include <sys/stat.h> - #include <sys/types.h> -+#ifndef major -+#include <sys/sysmacros.h> -+#endif - - #include <fcntl.h> - #include <stdio.h> -diff --git a/mountpoint.c b/mountpoint.c -index 8f205a2..726cc80 100644 ---- a/mountpoint.c -+++ b/mountpoint.c -@@ -1,6 +1,9 @@ - /* See LICENSE file for copyright and license details. */ - #include <sys/stat.h> - #include <sys/types.h> -+#ifndef major -+#include <sys/sysmacros.h> -+#endif - - #include <mntent.h> - #include <stdio.h> -diff --git a/stat.c b/stat.c -index 220a659..3a6569b 100644 ---- a/stat.c -+++ b/stat.c -@@ -1,6 +1,9 @@ - /* See LICENSE file for copyright and license details. */ - #include <sys/stat.h> - #include <sys/types.h> -+#ifndef major -+#include <sys/sysmacros.h> -+#endif - - #include <inttypes.h> - #include <stdio.h> diff --git a/core/ubase/patches/fix-mount.patch b/core/ubase/patches/fix-mount.patch @@ -1,12 +0,0 @@ -diff --git a/mount.c b/mount.c -index e3d00b8..172fd05 100644 ---- a/mount.c -+++ b/mount.c -@@ -36,6 +36,7 @@ struct { - { "mand", "nomand", MS_MANDLOCK }, - { "relatime", "norelatime", MS_RELATIME }, - { "bind", NULL, MS_BIND }, -+ { "move", NULL, MS_MOVE }, - { NULL, NULL, 0 } - }; - diff --git a/core/ubase/sources b/core/ubase/sources @@ -1,3 +0,0 @@ -git+git://git.suckless.org/ubase -patches/f3aa4b156360ce4a18e4a3897f883b663771ba24.patch -patches/fix-mount.patch diff --git a/core/ubase/version b/core/ubase/version @@ -1 +0,0 @@ -git 4