filesystem 20240401-1

This commit is contained in:
xhaa123 2024-04-15 03:01:24 +08:00
parent 9e91139fa6
commit 8fb1b52306
23 changed files with 30 additions and 463 deletions

120
PKGBUILD
View File

@ -1,12 +1,16 @@
# Maintainer: Future Linux Team <future_linux@163.com>
# This is an example PKGBUILD file. Use this as a start to creating your own,
# and remove these comments. For more information, see 'man PKGBUILD'.
# NOTE: Please fill out the license field for your package! If it is unknown,
# then please put 'unknown'.
# Maintainer: Future Linux Team <future_linux@163.com>
pkgname=filesystem
pkgver=20230525
pkgver=20240401
pkgrel=1
pkgdesc='Base Future Linux files'
pkgdesc="Base Future Linux files"
arch=('x86_64')
url='https://gitlab.com/future-linux/packages/base/filesystem'
license=('GPL')
url="https://futurelinux.github.io/"
license=('GPL-3.0-or-later')
groups=('base')
depends=('iana-etc')
backup=(etc/fstab
@ -16,22 +20,7 @@ backup=(etc/fstab
etc/issue
etc/locale.conf
etc/os-release
etc/passwd
etc/profile
etc/profile.d/bash_completion.sh
etc/profile.d/dircolors.sh
etc/profile.d/extrapaths.sh
etc/profile.d/readline.sh
etc/profile.d/umask.sh
etc/profile.d/i18n.sh
etc/bashrc
etc/shells
etc/skel/.bashrc
etc/skel/.bash_profile
etc/skel/.bash_logout
root/.bashrc
root/.bash_profile
root/.bash_logout)
etc/passwd)
source=(fstab
group
hostname
@ -39,55 +28,25 @@ source=(fstab
issue
locale.conf
os-release
passwd
profile
bash_completion.sh
bashrc
dircolors.sh
extrapaths.sh
i18n.sh
readline.sh
shells
skel_bash_logout
skel_bash_profile
skel_bashrc
umask.sh
futurelinux-logo.svg
futurelinux-logo.png
futurelinux-logo-text.svg
futurelinux-logo-text-dark.svg)
sha256sums=(e54626e74ed8fee4173b62a545ab1c3a3a069e4217a0ee8fc398d9933e9c1696
9fd2bbf7dbf7d0f97bc7901d772489a14f68d3a80b8f9823ea7a9ebff1eb1aa8
passwd)
sha256sums=(45d48dd125685c737136fc3deae94887bbdba46a5fb59244fb1ffb39cadb6620
005ef4e65e0f761e5d0f4b707c7f288e2492681cfe9835ff8caa8edfc33c1bc2
26520c981703c1ddc64c417d40861ec8e609df0db3de89a839fdf5f7aca87c03
bd5da73555d74602562fe2bcdc9b2f4551b75d4298ae76387374b6c274efaeec
1f8876b699499fa0c5cff76a1d314ada1f51f57a8b9f75fd6f449561fd925af0
6582f26b7a81cc95f46907fadb8569ec3f73bb0f0e2599c1dad0f1f01d90fb3a
689d2a528141f5e5947d55c92b2c885f29a36af0de3f35b4f44025e13b40f6b4
7817ee628fccd203d7f1bcc20f0afbbaaae615b5bc900314995da35764df0b47
cbe379603a114774f5ce3f858c9bac994e36d163abea3f037610f19a2c309f7b
c3358ba9f1ad54255a6960236b092e32c5077f658385a9d11dd46ca73f18ad2b
297cb27314a41cb54ca8397996912672845d2cfb164b581ac970d28aace32709
1c8ce873176834ecf414926bd3b4f7ae42df4065c10d9c503bc6f38894253c29
1f4933ecd55f17e8e09985b3500807f1672eb6427e3d78cb5d0ea1ac6069cf30
f3e273f0d78263ee2b9afe9e53f0531feeeaa50ab7592fc19bf339bd91a812fc
515a7a055ca3a3903c53c1b1a313eb3b5fa6bfbb70017472e5ca413d3f3b391b
1db1de0b837e46cac525afad0b39b41e730114294b209a023f2e7100a3efd2f7
7897e8aa1ab5662c507f1e794681b1e5d51f4f89d0855e039ab4931e1d952ed8
eb70198d31e27547ee6b24fc7f5fc9059b7aec79ff07d8d02f1302a7ba37a73e
ac61f99f0f5f4b35564cc5ac6db3527753f5c77412a54bcbeb10d0f67d3ab518
6ffa96e2dca75701c2e36ae1566c3b3b7e53464960be9e4b75ba730526a200b3
cdd69f562b4ef6f341745824a3d36a05ce01096e37e03489ee8861171c9f97b3
e25f17bbbf6be0c95f36789e25b6d8f1d29da2df71794ec8ad2c4d6c2e14fd1e
89f84c5c4eece74b37d5cd0d45fde3bb1ed634f53d03a2e5c0faac48e15ef3fc
b6d71ac001f5e4c6b440a09355436b2eab6aeeadc3fb757ae8bcd8b4cd863563)
13cb6513d6484f27053868f8f8f106b50386e406c7fd75fa98a7642ecd69c5dd
373af47d05b3b895092f43ed895d4680e0127627c05f2187d56794d2f1a43a57
0328593405c8c79ba4677a7d227cff0af65fcf4e6fde227bd80762900bf2cd80
ce9a337dda498168a2e372402fcebe090ba9a0908c5073d22622c945d5245635
7817ee628fccd203d7f1bcc20f0afbbaaae615b5bc900314995da35764df0b47)
package() {
install -vdm755 ${pkgdir}/{boot,dev,etc,home,mnt,usr/{bin,lib,lib64,sbin},var,opt,srv}
install -vdm0555 ${pkgdir}/proc ${pkgdir}/sys
install -vdm0555 ${pkgdir}/{proc,sys}
install -vdm0750 ${pkgdir}/root
install -vdm1777 ${pkgdir}/tmp ${pkgdir}/run ${pkgdir}/var/tmp
install -vdm1777 ${pkgdir}/{tmp,run} ${pkgdir}/var/tmp
install -vdm755 ${pkgdir}/etc/{opt,sysconfig}
install -vdm755 ${pkgdir}/usr/lib/firmware
@ -103,8 +62,8 @@ package() {
ln -sfv /run ${pkgdir}/var/run
ln -sfv /run/lock ${pkgdir}/var/lock
for l in bin lib lib64 sbin; do
ln -sv usr/${l} ${pkgdir}/${l}
for L in bin lib lib64 sbin; do
ln -sv usr/${L} ${pkgdir}/${L}
done
ln -sfv /proc/self/mounts ${pkgdir}/etc/mtab
@ -114,36 +73,9 @@ package() {
chmod -v 664 ${pkgdir}/var/log/lastlog
chmod -v 600 ${pkgdir}/var/log/btmp
for f in bashrc fstab group hostname hosts issue locale.conf passwd profile os-release; do
install -m644 ${srcdir}/${f} ${pkgdir}/etc/
for F in fstab group hostname hosts issue locale.conf passwd os-release; do
install -m644 ${srcdir}/${F} ${pkgdir}/etc/
done
touch ${pkgdir}/etc/future-release
install --directory --mode=0755 --owner=root --group=root ${pkgdir}/etc/profile.d
install -vDm644 ${srcdir}/bash_completion.sh ${pkgdir}/etc/profile.d/bash_completion.sh
install --directory --mode=0755 --owner=root --group=root ${pkgdir}/etc/bash_completion.d
for files in {dircolors,extrapaths,readline,umask,i18n}.sh
do
install -vm644 ${srcdir}/${files} ${pkgdir}/etc/profile.d/${files}
done
install -vdm0750 ${pkgdir}/root
for skel_files in skel_{bashrc,bash_profile,bash_logout}
do
install -vDm644 ${srcdir}/${skel_files} ${pkgdir}/etc/skel/.${skel_files#*_}
install -vm644 ${srcdir}/${skel_files} ${pkgdir}/root/.${skel_files#*_}
done
install -vm644 ${srcdir}/shells ${pkgdir}/etc/shells
dircolors -p > ${pkgdir}/etc/dircolors
for L in futurelinux-logo{.png,.svg,-text.svg,-text-dark.svg}; do
install -vDm644 ${srcdir}/${L} ${pkgdir}/usr/share/pixmaps/${L}
done
}

View File

@ -1,34 +0,0 @@
# Begin /etc/profile.d/bash_completion.sh
# Import bash completion scripts
# If the bash-completion package is installed, use its configuration instead
if [ -f /usr/share/bash-completion/bash_completion ]; then
# Check for interactive bash and that we haven't already been sourced.
if [ -n "${BASH_VERSION-}" -a -n "${PS1-}" -a -z "${BASH_COMPLETION_VERSINFO-}" ]; then
# Check for recent enough version of bash.
if [ ${BASH_VERSINFO[0]} -gt 4 ] || \
[ ${BASH_VERSINFO[0]} -eq 4 -a ${BASH_VERSINFO[1]} -ge 1 ]; then
[ -r "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion" ] && \
. "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion"
if shopt -q progcomp && [ -r /usr/share/bash-completion/bash_completion ]; then
# Source completion code.
. /usr/share/bash-completion/bash_completion
fi
fi
fi
else
# bash-completions are not installed, use only bash completion directory
if shopt -q progcomp; then
for script in /etc/bash_completion.d/* ; do
if [ -r $script ] ; then
. $script
fi
done
fi
fi
# End /etc/profile.d/bash_completion.sh

36
bashrc
View File

@ -1,36 +0,0 @@
# Begin /etc/bashrc
# Written for Beyond Linux From Scratch
# by James Robertson <jameswrobertson@earthlink.net>
# updated by Bruce Dubbs <bdubbs@linuxfromscratch.org>
# System wide aliases and functions.
# System wide environment variables and startup programs should go into
# /etc/profile. Personal environment variables and startup programs
# should go into ~/.bash_profile. Personal aliases and functions should
# go into ~/.bashrc
# Provides colored /bin/ls and /bin/grep commands. Used in conjunction
# with code in /etc/profile.
alias ls='ls --color=auto'
alias ll='ls -F -b -T 0 --group-directories-first --color=auto --format=long --time-style="+%F %T" --human-readable'
alias grep='grep --color=auto'
# Provides prompt for non-login shells, specifically shells started
# in the X environment. [Review the LFS archive thread titled
# PS1 Environment Variable for a great case study behind this script
# addendum.]
NORMAL="\[\e[0m\]"
RED="\[\e[1;31m\]"
GREEN="\[\e[1;32m\]"
if [[ $EUID == 0 ]] ; then
PS1="$RED\u [ $NORMAL\w$RED ]# $NORMAL"
else
PS1="$GREEN\u [ $NORMAL\w$GREEN ]\$ $NORMAL"
fi
unset RED GREEN NORMAL
# End /etc/bashrc

View File

@ -1,12 +0,0 @@
# Setup for /bin/ls and /bin/grep to support color, the alias is in /etc/bashrc.
if [ -f "/etc/dircolors" ] ; then
eval $(dircolors -b /etc/dircolors)
fi
if [ -f "$HOME/.dircolors" ] ; then
eval $(dircolors -b $HOME/.dircolors)
fi
alias ls='ls --color=auto'
alias ll='ls -F -b -T 0 --group-directories-first --color=auto --format=long --time-style="+%F %T" --human-readable'
alias grep='grep --color=auto'

View File

@ -1,17 +0,0 @@
if [ -d /usr/local/lib/pkgconfig ] ; then
pathappend /usr/local/lib/pkgconfig PKG_CONFIG_PATH
fi
if [ -d /usr/local/bin ]; then
pathprepend /usr/local/bin
fi
if [ -d /usr/local/sbin -a $EUID -eq 0 ]; then
pathprepend /usr/local/sbin
fi
if [ -d /usr/local/share ]; then
pathprepend /usr/local/share XDG_DATA_DIRS
fi
# Set some defaults before other applications add to these paths.
pathappend /usr/share/man MANPATH
pathappend /usr/share/info INFOPATH

1
fstab
View File

@ -2,3 +2,4 @@
# See fstab(5) for details.
# <file system> <dir> <type> <options> <dump> <pass>

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 86 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 86 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 23 KiB

1
group
View File

@ -12,7 +12,6 @@ dialout:x:10:
audio:x:11:
video:x:12:
utmp:x:13:
usb:x:14:
cdrom:x:15:
adm:x:16:
messagebus:x:18:

1
hosts
View File

@ -5,3 +5,4 @@
::1 localhost ip6-localhost ip6-loopback
ff02::1 ip6-allnodes
ff02::2 ip6-allrouters

View File

@ -1,3 +0,0 @@
# Set up i18n variables
. /etc/locale.conf
export LANG

1
issue
View File

@ -1,2 +1,3 @@
Future Linux \r (\l)

View File

@ -1 +1,2 @@
# This is the fallback locale configuration provided by systemd.

View File

@ -4,4 +4,3 @@ ID=future
BUILD_ID=rolling
ANSI_COLOR="38;2;23;147;209"
HOME_URL="https://futurelinux.github.io/"

80
profile
View File

@ -1,80 +0,0 @@
# /etc/profile
# System wide environment variables and startup programs.
# System wide aliases and functions should go in /etc/bashrc. Personal
# environment variables and startup programs should go into
# ~/.bash_profile. Personal aliases and functions should go into
# ~/.bashrc.
# Functions to help us manage paths. Second argument is the name of the
# path variable to be modified (default: PATH)
pathremove () {
local IFS=':'
local NEWPATH
local DIR
local PATHVARIABLE=${2:-PATH}
for DIR in ${!PATHVARIABLE} ; do
if [ "$DIR" != "$1" ] ; then
NEWPATH=${NEWPATH:+$NEWPATH:}$DIR
fi
done
export $PATHVARIABLE="$NEWPATH"
}
pathprepend () {
pathremove $1 $2
local PATHVARIABLE=${2:-PATH}
export $PATHVARIABLE="$1${!PATHVARIABLE:+:${!PATHVARIABLE}}"
}
pathappend () {
pathremove $1 $2
local PATHVARIABLE=${2:-PATH}
export $PATHVARIABLE="${!PATHVARIABLE:+${!PATHVARIABLE}:}$1"
}
export -f pathremove pathprepend pathappend
# Set the initial path
export PATH=/usr/bin
# Attempt to provide backward compatibility with LFS earlier than 11
if [ ! -L /bin ]; then
pathappend /bin
fi
if [ $EUID -eq 0 ] ; then
pathappend /usr/sbin
if [ ! -L /sbin ]; then
pathappend /sbin
fi
unset HISTFILE
fi
# Setup some environment variables.
export HISTSIZE=1000
export HISTIGNORE="&:[bf]g:exit"
# Set some defaults for graphical systems
export XDG_DATA_DIRS=${XDG_DATA_DIRS:-/usr/share/}
export XDG_CONFIG_DIRS=${XDG_CONFIG_DIRS:-/etc/xdg/}
export XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR:-/tmp/xdg-$USER}
# Setup a red prompt for root and a green one for users.
NORMAL="\[\e[0m\]"
RED="\[\e[1;31m\]"
GREEN="\[\e[1;32m\]"
if [[ $EUID == 0 ]] ; then
PS1="$RED\u [ $NORMAL\w$RED ]# $NORMAL"
else
PS1="$GREEN\u [ $NORMAL\w$GREEN ]\$ $NORMAL"
fi
for script in /etc/profile.d/*.sh ; do
if [ -r $script ] ; then
. $script
fi
done
unset script RED GREEN NORMAL

View File

@ -1,5 +0,0 @@
# Set up the INPUTRC environment variable.
if [ -z "$INPUTRC" -a ! -f "$HOME/.inputrc" ] ; then
INPUTRC=/etc/inputrc
fi
export INPUTRC

6
shells
View File

@ -1,6 +0,0 @@
# Begin /etc/shells
/bin/sh
/bin/bash
# End /etc/shells

View File

@ -1,7 +0,0 @@
# Begin ~/.bash_logout
# Written for Beyond Linux From Scratch
# by James Robertson <jameswrobertson@earthlink.net>
# Personal items to perform on logout.
# End ~/.bash_logout

View File

@ -1,25 +0,0 @@
# Begin ~/.bash_profile
# Written for Beyond Linux From Scratch
# by James Robertson <jameswrobertson@earthlink.net>
# updated by Bruce Dubbs <bdubbs@linuxfromscratch.org>
# Personal environment variables and startup programs.
# Personal aliases and functions should go in ~/.bashrc. System wide
# environment variables and startup programs are in /etc/profile.
# System wide aliases and functions are in /etc/bashrc.
if [ -f "$HOME/.bashrc" ] ; then
source $HOME/.bashrc
fi
if [ -d "$HOME/bin" ] ; then
pathprepend $HOME/bin
fi
# Having . in the PATH is dangerous
#if [ $EUID -gt 99 ]; then
# pathappend .
#fi
# End ~/.bash_profile

View File

@ -1,19 +0,0 @@
# Begin ~/.bashrc
# Written for Beyond Linux From Scratch
# by James Robertson <jameswrobertson@earthlink.net>
# Personal aliases and functions.
# Personal environment variables and startup programs should go in
# ~/.bash_profile. System wide environment variables and startup
# programs are in /etc/profile. System wide aliases and functions are
# in /etc/bashrc.
if [ -f "/etc/bashrc" ] ; then
source /etc/bashrc
fi
# Set up user specific i18n variables
#export LANG=<ll>_<CC>.<charmap><@modifiers>
# End ~/.bashrc

View File

@ -1,6 +0,0 @@
# By default, the umask should be set.
if [ "$(id -gn)" = "$(id -un)" -a $EUID -gt 99 ] ; then
umask 002
else
umask 022
fi