commit: e81dfb07f53e817a83e3c3a7c247cdb57a507fdf
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 4 05:56:37 2023 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Jan 4 05:56:37 2023 +0000
URL: https://gitweb.gentoo.org/proj/baselayout.git/commit/?id=e81dfb07
drop OS specific support
This is no longer needed since we have dropped support for *BSD.
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
Makefile | 50 +++++------------
etc.BSD/COPYRIGHT | 2 -
etc.BSD/issue | 3 -
etc.BSD/issue.logo | 13 -----
etc.BSD/login.conf | 65 ----------------------
{etc.Linux => etc}/filesystems | 0
{etc.Linux => etc}/inputrc | 0
{etc.Linux => etc}/issue | 0
{etc.Linux => etc}/issue.logo | 0
{lib.Linux => lib}/modprobe.d/aliases.conf | 0
{lib.Linux => lib}/modprobe.d/i386.conf | 0
{lib.Linux => lib}/sysctl.d/00protected-links.conf | 0
make_os_release | 8 +--
share.BSD/fstab | 21 -------
share.BSD/group | 18 ------
share.BSD/master.passwd | 15 -----
{share.Linux => share}/fstab | 0
{share.Linux => share}/group | 0
{share.Linux => share}/issue.devfix | 0
{share.Linux => share}/passwd | 0
{share.Linux => share}/shadow | 0
21 files changed, 17 insertions(+), 178 deletions(-)
diff --git a/Makefile b/Makefile
index b6d373db..0b020a9f 100644
--- a/Makefile
+++ b/Makefile
@@ -17,24 +17,10 @@ INSTALL_EXE = install -m 0755
INSTALL_FILE = install -m 0644
INSTALL_SECURE = install -m 0600
-ifeq ($(OS),)
-OS=$(shell uname -s)
-ifneq ($(OS),Linux)
-OS=BSD
-endif
-endif
-
-KEEP_DIRS-BSD += \
- /var/lock \
- /var/run
-KEEP_DIRS-Linux += \
- /dev \
- /run \
- /sys \
- /usr/src
-KEEP_DIRS = $(KEEP_DIRS-$(OS)) \
+KEEP_DIRS = \
/bin \
/boot \
+ /dev \
/etc/profile.d \
/home \
/media \
@@ -42,11 +28,14 @@ KEEP_DIRS = $(KEEP_DIRS-$(OS)) \
/opt \
/proc \
/root \
+ /run \
/sbin \
+ /sys \
/usr/bin \
/usr/local/bin \
/usr/local/sbin \
/usr/sbin \
+ /usr/src \
/var/cache \
/var/empty \
/var/lib \
@@ -62,53 +51,40 @@ clean:
install:
$(INSTALL_DIR) $(DESTDIR)/etc
- cp -pPR etc/* etc.$(OS)/* $(DESTDIR)/etc/
+ cp -pPR etc/* $(DESTDIR)/etc/
echo "Gentoo Base System release ${PV}" > ${DESTDIR}/etc/gentoo-release
$(INSTALL_DIR) $(DESTDIR)/lib
- cp -pPR lib.$(OS)/* $(DESTDIR)/lib/
+ cp -pPR lib/* $(DESTDIR)/lib/
$(INSTALL_DIR) $(DESTDIR)/usr/lib
ln -snf ../usr/lib/os-release ${DESTDIR}/etc/os-release
- ./make_os_release ${OS} ${PV} > $(DESTDIR)/usr/lib/os-release
+ ./make_os_release ${PV} > $(DESTDIR)/usr/lib/os-release
$(INSTALL_DIR) $(DESTDIR)/usr/share/baselayout
- cp -pPR share.$(OS)/* $(DESTDIR)/usr/share/baselayout/
+ cp -pPR share/* $(DESTDIR)/usr/share/baselayout/
-layout-dirs:
+layout:
# Create base filesytem layout
for x in $(KEEP_DIRS) ; do \
test -e $(DESTDIR)$$x/.keep && continue ; \
$(INSTALL_DIR) $(DESTDIR)$$x ; \
touch $(DESTDIR)$$x/.keep || true; \
done
-
-layout-BSD: layout-dirs
- -chgrp uucp $(DESTDIR)/var/lock
- install -m 0775 -d $(DESTDIR)/var/lock
-
-layout-Linux: layout-dirs
ln -snf /proc/self/mounts $(DESTDIR)/etc/mtab
ln -snf /run $(DESTDIR)/var/run
ln -snf /run/lock $(DESTDIR)/var/lock
-
-layout: layout-dirs layout-$(OS)
# Special dirs
- install -m 0700 -d $(DESTDIR)/root
- touch $(DESTDIR)/root/.keep
- install -m 1777 -d $(DESTDIR)/var/tmp
- touch $(DESTDIR)/var/tmp/.keep
- install -m 1777 -d $(DESTDIR)/tmp
- touch $(DESTDIR)/tmp/.keep
+ chmod 0700 $(DESTDIR)/root
+ chmod 1777 $(DESTDIR)/var/tmp
+ chmod 1777 $(DESTDIR)/tmp
# FHS compatibility symlinks stuff
ln -snf /var/tmp $(DESTDIR)/usr/tmp
layout-usrmerge: layout
-ifeq ($(OS),Linux)
rm -fr ${DESTDIR}/bin
rm -fr ${DESTDIR}/sbin
rm -fr ${DESTDIR}/usr/sbin
ln -snf usr/bin ${DESTDIR}/bin
ln -snf usr/bin ${DESTDIR}/sbin
ln -snf bin ${DESTDIR}/usr/sbin
-endif
live:
rm -rf /tmp/$(PKG)
diff --git a/etc.BSD/COPYRIGHT b/etc.BSD/COPYRIGHT
deleted file mode 100644
index 378f62fc..00000000
--- a/etc.BSD/COPYRIGHT
+++ /dev/null
@@ -1,2 +0,0 @@
-Copyright 1996-2007 Gentoo Foundation
-Copyright 1992-2007 The FreeBSD Project
diff --git a/etc.BSD/issue b/etc.BSD/issue
deleted file mode 100644
index 7a303dfb..00000000
--- a/etc.BSD/issue
+++ /dev/null
@@ -1,3 +0,0 @@
-
-This is %h (%s %m %r) %d
-
diff --git a/etc.BSD/issue.logo b/etc.BSD/issue.logo
deleted file mode 100644
index 81946e24..00000000
--- a/etc.BSD/issue.logo
+++ /dev/null
@@ -1,13 +0,0 @@
-[0;35;40m .
-[0;35;40m .vir. d$b
-[0;35;40m .d$$$$$$b. .cd$$b. .d$$b. d$$$$$$$$$$$b .d$$b.
.d$$b.
-[0;35;40m $$$$( )$$$b d$$$()$$$. d$$$$$$$b Q$$$$$$$P$$$P.$$$$$$$b.
.$$$$$$$b.
-[0;35;40m Q$$$$$$$$$$B$$$$$$$$P" d$$$PQ$$$$b. $$$$. .$$$P' `$$$ .$$$P'
`$$$
-[0;35;40m "$$$$$$$P Q$$$$$$$b d$$$P Q$$$$b $$$$b $$$$b..d$$$
$$$$b..d$$$
-[0;35;40m d$$$$$$P" "$$$$$$$$ Q$$$ Q$$$$ $$$$$ `Q$$$$$$$P
`Q$$$$$$$P
-[0;35;40m $$$$$$$P `""""" "" "" Q$$$P "Q$$$P"
"Q$$$P"
-[0;35;40m `Q$$P" """
-[0;37;40m
-
-This is %h (%s %m %r) %d
-
diff --git a/etc.BSD/login.conf b/etc.BSD/login.conf
deleted file mode 100644
index e38f1703..00000000
--- a/etc.BSD/login.conf
+++ /dev/null
@@ -1,65 +0,0 @@
-# login.conf - login class capabilities database.
-#
-# Remember to rebuild the database after each change to this file:
-#
-# cap_mkdb /etc/login.conf
-#
-# This file controls resource limits, accounting limits and
-# default user environment settings.
-
-# defaults
-# These settings are used by login(1) by default for classless users
-# Note that entries like "cputime" set both "cputime-cur" and "cputime-max"
-
-default:\
- :passwd_format=md5:\
- :copyright=/etc/COPYRIGHT:\
- :welcome=/etc/motd:\
- :setenv=FTP_PASSIVE_MODE=YES:\
- :path=/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin
~/bin:\
- :nologin=/etc/nologin:\
- :cputime=unlimited:\
- :datasize=unlimited:\
- :stacksize=unlimited:\
- :memorylocked=unlimited:\
- :memoryuse=unlimited:\
- :filesize=unlimited:\
- :coredumpsize=unlimited:\
- :openfiles=unlimited:\
- :maxproc=unlimited:\
- :sbsize=unlimited:\
- :vmemoryuse=unlimited:\
- :priority=0:\
- :ignoretime@:\
- :umask=022:
-
-#
-# Root can always login
-#
-# N.B. login_getpwclass(3) will use this entry for the root account,
-# in preference to 'default'.
-root:\
- :ignorenologin:\
- :tc=default:
-
-#
-# A collection of common class names - forward them all to 'default'
-# (login would normally do this anyway, but having a class name
-# here suppresses the diagnostic)
-#
-standard:\
- :tc=default:
-xuser:\
- :tc=default:
-daemon:\
- :tc=default:
-news:\
- :tc=default:
-
-#
-# Russian Users Accounts. Setup proper environment variables.
-#
-#russian|Russian Users Accounts:\
-# :charset=KOI8-R:\
-# :lang=ru_RU.KOI8-R:\
-# :tc=default:
diff --git a/etc.Linux/filesystems b/etc/filesystems
similarity index 100%
rename from etc.Linux/filesystems
rename to etc/filesystems
diff --git a/etc.Linux/inputrc b/etc/inputrc
similarity index 100%
rename from etc.Linux/inputrc
rename to etc/inputrc
diff --git a/etc.Linux/issue b/etc/issue
similarity index 100%
rename from etc.Linux/issue
rename to etc/issue
diff --git a/etc.Linux/issue.logo b/etc/issue.logo
similarity index 100%
rename from etc.Linux/issue.logo
rename to etc/issue.logo
diff --git a/lib.Linux/modprobe.d/aliases.conf b/lib/modprobe.d/aliases.conf
similarity index 100%
rename from lib.Linux/modprobe.d/aliases.conf
rename to lib/modprobe.d/aliases.conf
diff --git a/lib.Linux/modprobe.d/i386.conf b/lib/modprobe.d/i386.conf
similarity index 100%
rename from lib.Linux/modprobe.d/i386.conf
rename to lib/modprobe.d/i386.conf
diff --git a/lib.Linux/sysctl.d/00protected-links.conf
b/lib/sysctl.d/00protected-links.conf
similarity index 100%
rename from lib.Linux/sysctl.d/00protected-links.conf
rename to lib/sysctl.d/00protected-links.conf
diff --git a/make_os_release b/make_os_release
index f764309c..8fdba0ee 100755
--- a/make_os_release
+++ b/make_os_release
@@ -1,15 +1,15 @@
#!/bin/sh
-if [ -z "${1}" ] || [ -z "${2}" ]; then
- printf 'usage: %s [os] [version]' "${0##*/}" >&2
+if [ -z "${1}" ]; then
+ printf 'usage: %s [version]' "${0##*/}" >&2
exit 1
fi
cat <<EOF
NAME=Gentoo
ID=gentoo
-PRETTY_NAME="Gentoo ${1}"
+PRETTY_NAME="Gentoo Linux"
ANSI_COLOR="1;32"
HOME_URL="https://www.gentoo.org/";
SUPPORT_URL="https://www.gentoo.org/support/";
BUG_REPORT_URL="https://bugs.gentoo.org/";
-VERSION_ID="${2}"
+VERSION_ID="${1}"
EOF
diff --git a/share.BSD/fstab b/share.BSD/fstab
deleted file mode 100644
index d8afc169..00000000
--- a/share.BSD/fstab
+++ /dev/null
@@ -1,21 +0,0 @@
-# /etc/fstab: static file system information.
-#
-# noatime turns off atimes for increased performance (atimes normally aren't
-# needed).
-#
-# The root filesystem should have a pass number of either 0 or 1.
-# All other filesystems should have a pass number of 0 or greater than 1.
-#
-# See the manpage fstab(5) for more information.
-#
-
-# <fs> <mountpoint> <type> <opts> <dump/pass>
-
-#/dev/root / ufs rw,noatime 1 1
-#/dev/swap none swap sw 0 0
-
-#/dev/cdrom /mnt/cdrom cd9660 ro,noauto 0 0
-
-# Enable this line to mount /proc automatically.
-# Required for Linux emulation.
-#none /proc linprocfs rw,noexec,nosuid 0 0
diff --git a/share.BSD/group b/share.BSD/group
deleted file mode 100644
index df722791..00000000
--- a/share.BSD/group
+++ /dev/null
@@ -1,18 +0,0 @@
-wheel:*:0:root
-daemon:*:1:
-kmem:*:2:
-sys:*:3:
-tty:*:4:
-operator:*:5:root
-mail:*:6:
-bin:*:7:
-news:*:8:
-audio:*:18:
-guest:*:31:
-uucp:*:66:
-dialer:*:68:
-network:*:69:
-users:*:100:games
-portage:*:250:
-nogroup:*:65533:
-nobody:*:65534:
diff --git a/share.BSD/master.passwd b/share.BSD/master.passwd
deleted file mode 100644
index cc546e19..00000000
--- a/share.BSD/master.passwd
+++ /dev/null
@@ -1,15 +0,0 @@
-root:*:0:0::0:0:GOD:/root:/bin/bash
-toor:*:0:0::0:0:Bourne-again Superuser:/root:
-daemon:*:1:1::0:0:Owner of many system processes:/root:/usr/sbin/nologin
-operator:*:2:5::0:0:System Operator:/:/usr/sbin/nologin
-bin:*:3:7::0:0:Binaries Commands and Source:/:/usr/sbin/nologin
-tty:*:4:65533::0:0:Tty Sandbox:/:/usr/sbin/nologin
-kmem:*:5:65533::0:0:KMem Sandbox:/:/usr/sbin/nologin
-mail:*:6:6::0:0:Mail programs:/var/spool/mail:/usr/sbin/nologin
-games:*:7:13::0:0:Games pseudo-user:/usr/games:/usr/sbin/nologin
-news:*:8:8::0:0:News Subsystem:/:/usr/sbin/nologin
-man:*:9:9::0:0:Mister Man Pages:/usr/share/man:/usr/sbin/nologin
-smmsp:*:25:25::0:0:Sendmail Submission
User:/var/spool/clientmqueue:/usr/sbin/nologin
-uucp:*:66:66::0:0:UUCP
pseudo-user:/var/spool/uucppublic:/usr/local/libexec/uucp/uucico
-portage:*:250:250::0:0:Portage user:/var/tmp/portage/homedir:/bin/sh
-nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin
diff --git a/share.Linux/fstab b/share/fstab
similarity index 100%
rename from share.Linux/fstab
rename to share/fstab
diff --git a/share.Linux/group b/share/group
similarity index 100%
rename from share.Linux/group
rename to share/group
diff --git a/share.Linux/issue.devfix b/share/issue.devfix
similarity index 100%
rename from share.Linux/issue.devfix
rename to share/issue.devfix
diff --git a/share.Linux/passwd b/share/passwd
similarity index 100%
rename from share.Linux/passwd
rename to share/passwd
diff --git a/share.Linux/shadow b/share/shadow
similarity index 100%
rename from share.Linux/shadow
rename to share/shadow
