initramfs-tools: update to 0.94.
klibc requirement and associated code has been removed due to its current state, i.e unmaintained. Switch completely to busybox, removes another annoying build/run dependency. --HG-- extra : convert_revision : 67ff872d24eb547f538ec656d5565c82d496dcda
This commit is contained in:
parent
a035d73369
commit
9538b11955
6 changed files with 22 additions and 52 deletions
|
@ -237,7 +237,7 @@ dep_add_modules()
|
||||||
|
|
||||||
# find out real rootfs on auto type
|
# find out real rootfs on auto type
|
||||||
if [ "${FSTYPE}" = "auto" ]; then
|
if [ "${FSTYPE}" = "auto" ]; then
|
||||||
eval "$(/usr/lib/klibc/bin/fstype ${root})"
|
eval "$(blkid -s TYPE -o value ${root})"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# check that fstype rootfs recognition
|
# check that fstype rootfs recognition
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
PREREQ="klibc"
|
PREREQ=""
|
||||||
|
|
||||||
prereqs()
|
prereqs()
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,24 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
PREREQ=""
|
|
||||||
|
|
||||||
prereqs()
|
|
||||||
{
|
|
||||||
echo "$PREREQ"
|
|
||||||
}
|
|
||||||
|
|
||||||
case $1 in
|
|
||||||
# get pre-requisites
|
|
||||||
prereqs)
|
|
||||||
prereqs
|
|
||||||
exit 0
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# klibc
|
|
||||||
ln -s /usr/lib/klibc/bin/* ${DESTDIR}/bin
|
|
||||||
ln -s /lib/klibc-*.so ${DESTDIR}/lib
|
|
||||||
rm -f ${DESTDIR}/bin/kinit* ${DESTDIR}/bin/gzip \
|
|
||||||
${DESTDIR}/bin/zcat ${DESTDIR}/bin/gunzip
|
|
||||||
|
|
||||||
exit 0
|
|
|
@ -1,18 +1,21 @@
|
||||||
#!/bin/sh
|
#!/bin/busybox sh
|
||||||
|
|
||||||
echo "Starting up the initramfs, please wait..."
|
echo "Starting up the initramfs, please wait..."
|
||||||
|
|
||||||
# Create some required busybox symlinks.
|
BUSYBOX_LINKS="
|
||||||
if [ -x /bin/busybox ]; then
|
[ [[ ash awk basename cat chgrp chmod chown chroot clear cmp comm cp \
|
||||||
for f in cut touch tr grep awk tail basename ls cp rm \
|
cut date dd deallocvt df dirname dmesg dnsdomainname du echo \
|
||||||
head expr du sed rmdir; do
|
egrep env expand expr false fgrep find fsync fuser grep head hexdump hostname \
|
||||||
busybox ln -s /bin/busybox /bin/${f}
|
id install kbd_mode kill killall killall5 ln loadfont losetup ls lsmod \
|
||||||
done
|
mkdir mkfifo mknod mktemp more mount mv pgrep pidof pivot_root pkill \
|
||||||
rm -f /bin/dmesg
|
printenv printf ps pwd readlink realpath rm rmdir sed seq sh sleep sort \
|
||||||
busybox ln -s /bin/busybox /bin/dmesg
|
split stat stty sum switch_root sync tac tail tee test top touch tr true tty \
|
||||||
busybox ln -s /bin/busybox /sbin/pkill
|
umount uname uniq vi wc xargs yes"
|
||||||
fi
|
|
||||||
dmesg -n1
|
# Create required busybox symlinks
|
||||||
|
for f in $BUSYBOX_LINKS; do
|
||||||
|
/bin/busybox ln -s /bin/busybox /bin/${f}
|
||||||
|
done
|
||||||
|
|
||||||
[ -d /dev ] || mkdir -m 0755 /dev
|
[ -d /dev ] || mkdir -m 0755 /dev
|
||||||
[ -d /root ] || mkdir -m 0700 /root
|
[ -d /root ] || mkdir -m 0700 /root
|
||||||
|
@ -266,5 +269,5 @@ unset resume
|
||||||
unset resume_offset
|
unset resume_offset
|
||||||
|
|
||||||
# Chain to real filesystem
|
# Chain to real filesystem
|
||||||
exec run-init ${rootmnt} ${init} "$@"
|
exec switch_root ${rootmnt} ${init} "$@"
|
||||||
panic "Could not execute run-init."
|
panic "Could not execute run-init."
|
||||||
|
|
|
@ -8,12 +8,7 @@ get_fstype ()
|
||||||
local FS FSTYPE FSSIZE RET
|
local FS FSTYPE FSSIZE RET
|
||||||
FS="${1}"
|
FS="${1}"
|
||||||
|
|
||||||
# blkid has a more complete list of file systems,
|
FSTYPE=$(/sbin/blkid -s TYPE -o value "${FS}" 2> /dev/null)
|
||||||
# but fstype is more robust
|
|
||||||
eval $(fstype "${FS}" 2> /dev/null)
|
|
||||||
if [ "$FSTYPE" = "unknown" ] && [ -x /sbin/blkid ]; then
|
|
||||||
FSTYPE=$(/sbin/blkid -s TYPE -o value "${FS}" 2> /dev/null)
|
|
||||||
fi
|
|
||||||
RET=$?
|
RET=$?
|
||||||
|
|
||||||
if [ -z "${FSTYPE}" ]; then
|
if [ -z "${FSTYPE}" ]; then
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
# Template file for 'initramfs-tools'
|
# Template file for 'initramfs-tools'
|
||||||
pkgname=initramfs-tools
|
pkgname=initramfs-tools
|
||||||
version=0.93.3
|
version=0.94
|
||||||
revision=3
|
|
||||||
build_style=custom-install
|
build_style=custom-install
|
||||||
short_desc="Tools for generating an initramfs"
|
short_desc="Tools for generating an initramfs"
|
||||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||||
|
@ -11,9 +10,8 @@ long_desc="
|
||||||
Linux kernel. The initramfs is a gzipped cpio archive. At boot time, the
|
Linux kernel. The initramfs is a gzipped cpio archive. At boot time, the
|
||||||
kernel unpacks that archive into RAM, mounts and uses it as initial root
|
kernel unpacks that archive into RAM, mounts and uses it as initial root
|
||||||
file system. The mounting of the real root file system occurs in early user
|
file system. The mounting of the real root file system occurs in early user
|
||||||
space. klibc provides utilities to setup root. Having the root on EVMS, MD,
|
space. Having the root on EVMS, MD, LVM2, LUKS or NFS is also supported.
|
||||||
LVM2, LUKS or NFS is also supported. Any boot loader with initrd support is
|
Any boot loader with initrd support is able to load an initramfs archive."
|
||||||
able to load an initramfs archive."
|
|
||||||
|
|
||||||
noextract=yes
|
noextract=yes
|
||||||
noarch=yes
|
noarch=yes
|
||||||
|
@ -32,8 +30,6 @@ Add_dependency full grep
|
||||||
Add_dependency full gzip
|
Add_dependency full gzip
|
||||||
Add_dependency full udev
|
Add_dependency full udev
|
||||||
Add_dependency full module-init-tools
|
Add_dependency full module-init-tools
|
||||||
Add_dependency build klibc
|
|
||||||
Add_dependency run klibc-utils
|
|
||||||
Add_dependency full busybox-initramfs
|
Add_dependency full busybox-initramfs
|
||||||
|
|
||||||
do_install()
|
do_install()
|
||||||
|
|
Loading…
Reference in a new issue