summaryrefslogtreecommitdiff
path: root/repo/system
diff options
context:
space:
mode:
Diffstat (limited to 'repo/system')
-rw-r--r--repo/system/bzip2.xibuild2
-rw-r--r--repo/system/elogind.xibuild2
-rw-r--r--repo/system/mkinitramfs.xibuild370
-rw-r--r--repo/system/sbase.xibuild5
-rw-r--r--repo/system/shadow.xibuild41
-rw-r--r--repo/system/ubase.xibuild9
6 files changed, 49 insertions, 380 deletions
diff --git a/repo/system/bzip2.xibuild b/repo/system/bzip2.xibuild
index f775eee..d0d42f6 100644
--- a/repo/system/bzip2.xibuild
+++ b/repo/system/bzip2.xibuild
@@ -28,7 +28,7 @@ package () {
cp -a libbz2.so.$PKG_VER $PKG_DEST/usr/lib/libbz2.so
cp bzip2-shared $PKG_DEST/usr/bin/bzip2
- for i in $PKG_DEST/usr/bin/{bzcat,bunzip2}; do
+ for i in $PKG_DEST/usr/bin/bzcat $PKG_DEST/usr/bin/bunzip2; do
ln -sf bzip2 $i
done
diff --git a/repo/system/elogind.xibuild b/repo/system/elogind.xibuild
index 64be2c1..9ecc089 100644
--- a/repo/system/elogind.xibuild
+++ b/repo/system/elogind.xibuild
@@ -1,6 +1,6 @@
#!/bin/sh
-MAKEDEPS="make docbook4-xml docbook-xsl docbook-dtd libxslt ubase glib acl m4"
+MAKEDEPS="make docbook4-xml docbook-xsl docbook-dtd libxslt util-linux glib acl m4"
DEPS="pam gperf eudev"
PKG_VER=246.10
diff --git a/repo/system/mkinitramfs.xibuild b/repo/system/mkinitramfs.xibuild
deleted file mode 100644
index 7fa414f..0000000
--- a/repo/system/mkinitramfs.xibuild
+++ /dev/null
@@ -1,370 +0,0 @@
-#!/bin/sh
-
-MAKEDEPS="make "
-DEPS="sh"
-
-PKG_VER=0.1
-DESC="Scripts to make initramfs"
-
-package () {
- mkdir -pv $PKG_DEST/usr/sbin/
- cat > $PKG_DEST/usr/sbin/mkinitramfs << "EOF"
-#!/bin/sh
-# This file based in part on the mkinitramfs script for the LFS LiveCD
-# written by Alexander E. Patrakov and Jeremy Huntwork.
-
-copy()
-{
- local file
-
- if [ "$2" = "lib" ]; then
- file=$(PATH=/usr/lib type -p $1)
- else
- file=$(type -p $1)
- fi
-
- if [ -n "$file" ] ; then
- cp $file $WDIR/usr/$2
- else
- echo "Missing required file: $1 for directory $2"
- rm -rf $WDIR
- exit 1
- fi
-}
-
-if [ -z $1 ] ; then
- INITRAMFS_FILE=initrd.img-no-kmods
-else
- KERNEL_VERSION=$1
- INITRAMFS_FILE=initrd.img-$KERNEL_VERSION
-fi
-
-if [ -n "$KERNEL_VERSION" ] && [ ! -d "/usr/lib/modules/$1" ] ; then
- echo "No modules directory named $1"
- exit 1
-fi
-
-printf "Creating $INITRAMFS_FILE... "
-
-binfiles="sh cat cp dd killall ls mkdir mknod mount "
-binfiles="$binfiles umount sed sleep ln rm uname"
-binfiles="$binfiles readlink basename"
-
-# Systemd installs udevadm in /bin. Other udev implementations have it in /sbin
-if [ -x /usr/bin/udevadm ] ; then binfiles="$binfiles udevadm"; fi
-
-sbinfiles="modprobe blkid switch_root"
-
-# Optional files and locations
-for f in mdadm mdmon udevd udevadm; do
- if [ -x /usr/sbin/$f ] ; then sbinfiles="$sbinfiles $f"; fi
-done
-
-# Add lvm if present (cannot be done with the others because it
-# also needs dmsetup
-if [ -x /usr/sbin/lvm ] ; then sbinfiles="$sbinfiles lvm dmsetup"; fi
-
-unsorted=$(mktemp /tmp/unsorted.XXXXXXXXXX)
-
-DATADIR=/usr/share/mkinitramfs
-INITIN=init.in
-
-# Create a temporary working directory
-WDIR=$(mktemp -d /tmp/initrd-work.XXXXXXXXXX)
-
-# Create base directory structure
-mkdir -p $WDIR/{dev,run,sys,proc,usr/{bin,lib/{firmware,modules},sbin}}
-mkdir -p $WDIR/etc/{modprobe.d,udev/rules.d}
-touch $WDIR/etc/modprobe.d/modprobe.conf
-ln -s usr/bin $WDIR/bin
-ln -s usr/lib $WDIR/lib
-ln -s usr/sbin $WDIR/sbin
-ln -s lib $WDIR/lib64
-
-# Create necessary device nodes
-mknod -m 640 $WDIR/dev/console c 5 1
-mknod -m 664 $WDIR/dev/null c 1 3
-
-# Install the udev configuration files
-if [ -f /etc/udev/udev.conf ]; then
- cp /etc/udev/udev.conf $WDIR/etc/udev/udev.conf
-fi
-
-for file in $(find /etc/udev/rules.d/ -type f) ; do
- cp $file $WDIR/etc/udev/rules.d
-done
-
-# Install any firmware present
-cp -a /usr/lib/firmware $WDIR/usr/lib
-
-# Copy the RAID configuration file if present
-if [ -f /etc/mdadm.conf ] ; then
- cp /etc/mdadm.conf $WDIR/etc
-fi
-
-# Install the init file
-install -m0755 $DATADIR/$INITIN $WDIR/init
-
-if [ -n "$KERNEL_VERSION" ] ; then
- if [ -x /usr/bin/kmod ] ; then
- binfiles="$binfiles kmod"
- else
- binfiles="$binfiles lsmod"
- sbinfiles="$sbinfiles insmod"
- fi
-fi
-
-# Install basic binaries
-for f in $binfiles ; do
- ldd /usr/bin/$f | sed "s/\t//" | cut -d " " -f1 >> $unsorted
- copy /usr/bin/$f bin
-done
-
-for f in $sbinfiles ; do
- ldd /usr/sbin/$f | sed "s/\t//" | cut -d " " -f1 >> $unsorted
- copy $f sbin
-done
-
-# Add udevd libraries if not in /usr/sbin
-if [ -x /usr/lib/udev/udevd ] ; then
- ldd /usr/lib/udev/udevd | sed "s/\t//" | cut -d " " -f1 >> $unsorted
-elif [ -x /usr/lib/systemd/systemd-udevd ] ; then
- ldd /usr/lib/systemd/systemd-udevd | sed "s/\t//" | cut -d " " -f1 >> $unsorted
-fi
-
-# Add module symlinks if appropriate
-if [ -n "$KERNEL_VERSION" ] && [ -x /usr/bin/kmod ] ; then
- ln -s kmod $WDIR/usr/bin/lsmod
- ln -s kmod $WDIR/usr/bin/insmod
-fi
-
-# Add lvm symlinks if appropriate
-# Also copy the lvm.conf file
-if [ -x /usr/sbin/lvm ] ; then
- ln -s lvm $WDIR/usr/sbin/lvchange
- ln -s lvm $WDIR/usr/sbin/lvrename
- ln -s lvm $WDIR/usr/sbin/lvextend
- ln -s lvm $WDIR/usr/sbin/lvcreate
- ln -s lvm $WDIR/usr/sbin/lvdisplay
- ln -s lvm $WDIR/usr/sbin/lvscan
-
- ln -s lvm $WDIR/usr/sbin/pvchange
- ln -s lvm $WDIR/usr/sbin/pvck
- ln -s lvm $WDIR/usr/sbin/pvcreate
- ln -s lvm $WDIR/usr/sbin/pvdisplay
- ln -s lvm $WDIR/usr/sbin/pvscan
-
- ln -s lvm $WDIR/usr/sbin/vgchange
- ln -s lvm $WDIR/usr/sbin/vgcreate
- ln -s lvm $WDIR/usr/sbin/vgscan
- ln -s lvm $WDIR/usr/sbin/vgrename
- ln -s lvm $WDIR/usr/sbin/vgck
- # Conf file(s)
- cp -a /etc/lvm $WDIR/etc
-fi
-
-# Install libraries
-sort $unsorted | uniq | while read library ; do
-# linux-vdso and linux-gate are pseudo libraries and do not correspond to a file
-# libsystemd-shared is in /lib/systemd, so it is not found by copy, and
-# it is copied below anyway
- if [[ "$library" == linux-vdso.so.1 ]] ||
- [[ "$library" == linux-gate.so.1 ]] ||
- [[ "$library" == libsystemd-shared* ]]; then
- continue
- fi
-
- copy $library lib
-done
-
-if [ -d /usr/lib/udev ]; then
- cp -a /usr/lib/udev $WDIR/usr/lib
-fi
-if [ -d /usr/lib/systemd ]; then
- cp -a /usr/lib/systemd $WDIR/usr/lib
-fi
-if [ -d /usr/lib/elogind ]; then
- cp -a /usr/lib/elogind $WDIR/usr/lib
-fi
-
-# Install the kernel modules if requested
-if [ -n "$KERNEL_VERSION" ]; then
- find \
- /usr/lib/modules/$KERNEL_VERSION/kernel/{crypto,fs,lib} \
- /usr/lib/modules/$KERNEL_VERSION/kernel/drivers/{block,ata,md,firewire} \
- /usr/lib/modules/$KERNEL_VERSION/kernel/drivers/{scsi,message,pcmcia,virtio} \
- /usr/lib/modules/$KERNEL_VERSION/kernel/drivers/usb/{host,storage} \
- -type f 2> /dev/null | cpio --make-directories -p --quiet $WDIR
-
- cp /usr/lib/modules/$KERNEL_VERSION/modules.{builtin,order} \
- $WDIR/usr/lib/modules/$KERNEL_VERSION
-
- depmod -b $WDIR $KERNEL_VERSION
-fi
-
-( cd $WDIR ; find . | cpio -o -H newc --quiet | gzip -9 ) > $INITRAMFS_FILE
-
-# Prepare early loading of microcode if available
-if ls /usr/lib/firmware/intel-ucode/* >/dev/null 2>&1 ||
- ls /usr/lib/firmware/amd-ucode/* >/dev/null 2>&1; then
-
-# first empty WDIR to reuse it
- rm -r $WDIR/*
-
- DSTDIR=$WDIR/kernel/x86/microcode
- mkdir -p $DSTDIR
-
- if [ -d /usr/lib/firmware/amd-ucode ]; then
- cat /usr/lib/firmware/amd-ucode/microcode_amd*.bin > $DSTDIR/AuthenticAMD.bin
- fi
-
- if [ -d /usr/lib/firmware/intel-ucode ]; then
- cat /usr/lib/firmware/intel-ucode/* > $DSTDIR/GenuineIntel.bin
- fi
-
- ( cd $WDIR; find . | cpio -o -H newc --quiet ) > microcode.img
- cat microcode.img $INITRAMFS_FILE > tmpfile
- mv tmpfile $INITRAMFS_FILE
- rm microcode.img
-fi
-
-# Remove the temporary directories and files
-rm -rf $WDIR $unsorted
-printf "done.\n"
-
-EOF
-
- chmod 0755 $PKG_DEST/usr/sbin/mkinitramfs
-
- mkdir -p $PKG_DEST/usr/share/mkinitramfs &&
- cat > $PKG_DEST/usr/share/mkinitramfs/init.in << "EOF"
-#!/bin/sh
-
-PATH=/usr/bin:/usr/sbin
-export PATH
-
-problem()
-{
- printf "Encountered a problem!\n\nDropping you to a shell.\n\n"
- sh
-}
-
-no_device()
-{
- printf "The device %s, which is supposed to contain the\n" $1
- printf "root file system, does not exist.\n"
- printf "Please fix this problem and exit this shell.\n\n"
-}
-
-no_mount()
-{
- printf "Could not mount device %s\n" $1
- printf "Sleeping forever. Please reboot and fix the kernel command line.\n\n"
- printf "Maybe the device is formatted with an unsupported file system?\n\n"
- printf "Or maybe filesystem type autodetection went wrong, in which case\n"
- printf "you should add the rootfstype=... parameter to the kernel command line.\n\n"
- printf "Available partitions:\n"
-}
-
-do_mount_root()
-{
- mkdir /.root
- [ -n "$rootflags" ] && rootflags="$rootflags,"
- rootflags="$rootflags$ro"
-
- case "$root" in
- /dev/* ) device=$root ;;
- UUID=* ) eval $root; device="/dev/disk/by-uuid/$UUID" ;;
- PARTUUID=*) eval $root; device="/dev/disk/by-partuuid/$PARTUUID" ;;
- LABEL=* ) eval $root; device="/dev/disk/by-label/$LABEL" ;;
- "" ) echo "No root device specified." ; problem ;;
- esac
-
- while [ ! -b "$device" ] ; do
- no_device $device
- problem
- done
-
- if ! mount -n -t "$rootfstype" -o "$rootflags" "$device" /.root ; then
- no_mount $device
- cat /proc/partitions
- while true ; do sleep 10000 ; done
- else
- echo "Successfully mounted device $root"
- fi
-}
-
-do_try_resume()
-{
- case "$resume" in
- UUID=* ) eval $resume; resume="/dev/disk/by-uuid/$UUID" ;;
- LABEL=*) eval $resume; resume="/dev/disk/by-label/$LABEL" ;;
- esac
-
- if $noresume || ! [ -b "$resume" ]; then return; fi
-
- ls -lH "$resume" | ( read x x x x maj min x
- echo -n ${maj%,}:$min > /sys/power/resume )
-}
-
-init=/sbin/init
-root=
-rootdelay=
-rootfstype=auto
-ro="ro"
-rootflags=
-device=
-resume=
-noresume=false
-
-mount -n -t devtmpfs devtmpfs /dev
-mount -n -t proc proc /proc
-mount -n -t sysfs sysfs /sys
-mount -n -t tmpfs tmpfs /run
-
-read -r cmdline < /proc/cmdline
-
-for param in $cmdline ; do
- case $param in
- init=* ) init=${param#init=} ;;
- root=* ) root=${param#root=} ;;
- rootdelay=* ) rootdelay=${param#rootdelay=} ;;
- rootfstype=*) rootfstype=${param#rootfstype=} ;;
- rootflags=* ) rootflags=${param#rootflags=} ;;
- resume=* ) resume=${param#resume=} ;;
- noresume ) noresume=true ;;
- ro ) ro="ro" ;;
- rw ) ro="rw" ;;
- esac
-done
-
-# udevd location depends on version
-if [ -x /sbin/udevd ]; then
- UDEVD=/sbin/udevd
-elif [ -x /lib/udev/udevd ]; then
- UDEVD=/lib/udev/udevd
-elif [ -x /lib/systemd/systemd-udevd ]; then
- UDEVD=/lib/systemd/systemd-udevd
-else
- echo "Cannot find udevd nor systemd-udevd"
- problem
-fi
-
-${UDEVD} --daemon --resolve-names=never
-udevadm trigger
-udevadm settle
-
-if [ -f /etc/mdadm.conf ] ; then mdadm -As ; fi
-if [ -x /sbin/vgchange ] ; then /sbin/vgchange -a y > /dev/null ; fi
-if [ -n "$rootdelay" ] ; then sleep "$rootdelay" ; fi
-
-do_try_resume # This function will not return if resuming from disk
-do_mount_root
-
-killall -w ${UDEVD##*/}
-
-exec switch_root /.root "$init" "$@"
-
-EOF
-
-}
diff --git a/repo/system/sbase.xibuild b/repo/system/sbase.xibuild
index 03e8f86..38559f8 100644
--- a/repo/system/sbase.xibuild
+++ b/repo/system/sbase.xibuild
@@ -1,7 +1,7 @@
#!/bin/sh
MAKEDEPS="make "
-DEPS="musl acl attr gmp"
+DEPS="musl acl attr gmp ubase"
SOURCE=https://git.suckless.org/sbase
@@ -22,7 +22,8 @@ build () {
package () {
make PREFIX=/usr DESTDIR=$PKG_DEST install
- for p in tar sed find; do
+ # these are provided by other utils
+ for p in tar sed find xargs; do
rm $PKG_DEST/usr/bin/$p
rm $PKG_DEST/usr/share/man/man1/$p.1
done
diff --git a/repo/system/shadow.xibuild b/repo/system/shadow.xibuild
index 9441221..9d490c4 100644
--- a/repo/system/shadow.xibuild
+++ b/repo/system/shadow.xibuild
@@ -181,9 +181,48 @@ EOF
}
postinstall () {
+
+ [ ! -f /etc/passwd ] &&
+ cat > /etc/passwd << "EOF"
+root:x:0:0:root:/root:/bin/bash
+bin:x:1:1:bin:/dev/null:/usr/bin/false
+daemon:x:6:6:Daemon User:/dev/null:/usr/bin/false
+messagebus:x:18:18:D-Bus Message Daemon User:/run/dbus:/usr/bin/false
+uuidd:x:80:80:UUID Generation Daemon User:/dev/null:/usr/bin/false
+nobody:x:99:99:Unprivileged User:/dev/null:/usr/bin/false
+EOF
+
+ [ ! -f /etc/group ] &&
+ cat > /etc/group << "EOF"
+root:x:0:root
+bin:x:1:daemon
+sys:x:2:
+kmem:x:3:
+tape:x:4:
+tty:x:5:
+daemon:x:6:
+floppy:x:7:
+disk:x:8:
+lp:x:9:
+dialout:x:10:
+audio:x:11:
+video:x:12:
+utmp:x:13:
+usb:x:14:
+cdrom:x:15:
+adm:x:16:
+messagebus:x:18:
+input:x:24:
+mail:x:34:
+kvm:x:61:
+uuidd:x:80:
+wheel:x:97:
+nogroup:x:99:
+users:x:999:
+EOF
/usr/sbin/pwconv
/usr/sbin/grpconv
mkdir -p /etc/default
-
/usr/sbin/useradd -D --gid 999
+
}
diff --git a/repo/system/ubase.xibuild b/repo/system/ubase.xibuild
index 2e029a7..6b21576 100644
--- a/repo/system/ubase.xibuild
+++ b/repo/system/ubase.xibuild
@@ -16,10 +16,9 @@ build () {
}
package () {
- make PREFIX=/usr DESTDIR=$PKG_DEST install
+ install -d $PKG_DEST/usr/bin
+ install -m755 stat $PKG_DEST/usr/bin
- #for p in todo; do
- # rm $PKG_DEST/usr/bin/$p
- # rm $PKG_DEST/usr/share/man/man1/$p.1
- #done
+ install -d $PKG_DEST/usr/share/man
+ install -m644 stat.1 $PKG_DEST/usr/share/man/stat.1
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-22 01:55:21 +0000