mirror of
https://github.com/fosslinux/live-bootstrap.git
synced 2026-03-18 17:25:24 +01:00
Various fixes + cleanup.
- Add parts.rst documentation for Linux kernel. - Completely fix problems caused by new bootstrap, update checksums for /usr. - Globalise populate_device_nodes. - Enable deblobbing.
This commit is contained in:
parent
d429c48d76
commit
04180f5672
48 changed files with 438 additions and 342 deletions
|
|
@ -9,8 +9,8 @@ src_prepare() {
|
|||
}
|
||||
|
||||
src_configure() {
|
||||
./configure --prefix=${PREFIX} \
|
||||
--target=i386-unknown-linux-gnu \
|
||||
--host=i386-unknown-linux-gnu \
|
||||
--build=i386-unknown-linux-gnu
|
||||
./configure --prefix=${PREFIX}
|
||||
# --target=i386-unknown-linux-gnu \
|
||||
# --host=i386-unknown-linux-gnu \
|
||||
# --build=i386-unknown-linux-gnu
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1464,7 +1464,7 @@ CONFIG_NET_VENDOR_EXAR=y
|
|||
CONFIG_NET_VENDOR_HP=y
|
||||
# CONFIG_HP100 is not set
|
||||
CONFIG_NET_VENDOR_INTEL=y
|
||||
CONFIG_E100=y
|
||||
# CONFIG_E100 is not set
|
||||
CONFIG_E1000=y
|
||||
CONFIG_E1000E=y
|
||||
CONFIG_E1000E_HWTS=y
|
||||
|
|
@ -1548,7 +1548,7 @@ CONFIG_NET_VENDOR_SUN=y
|
|||
# CONFIG_CASSINI is not set
|
||||
# CONFIG_NIU is not set
|
||||
CONFIG_NET_VENDOR_SYNOPSYS=y
|
||||
CONFIG_NET_VENDOR_TEHUTI=y
|
||||
# CONFIG_NET_VENDOR_TEHUTI is not set
|
||||
# CONFIG_TEHUTI is not set
|
||||
CONFIG_NET_VENDOR_TI=y
|
||||
# CONFIG_TI_CPSW_ALE is not set
|
||||
|
|
@ -2705,7 +2705,7 @@ CONFIG_USB_SERIAL_AIRCABLE=y
|
|||
CONFIG_USB_SERIAL_ARK3116=y
|
||||
CONFIG_USB_SERIAL_BELKIN=y
|
||||
CONFIG_USB_SERIAL_CH341=y
|
||||
CONFIG_USB_SERIAL_WHITEHEAT=y
|
||||
# CONFIG_USB_SERIAL_WHITEHEAT is not set
|
||||
CONFIG_USB_SERIAL_DIGI_ACCELEPORT=y
|
||||
CONFIG_USB_SERIAL_CP210X=y
|
||||
CONFIG_USB_SERIAL_CYPRESS_M8=y
|
||||
|
|
@ -2714,21 +2714,21 @@ CONFIG_USB_SERIAL_FTDI_SIO=y
|
|||
CONFIG_USB_SERIAL_VISOR=y
|
||||
CONFIG_USB_SERIAL_IPAQ=y
|
||||
CONFIG_USB_SERIAL_IR=y
|
||||
CONFIG_USB_SERIAL_EDGEPORT=y
|
||||
CONFIG_USB_SERIAL_EDGEPORT_TI=y
|
||||
# CONFIG_USB_SERIAL_EDGEPORT is not set
|
||||
# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
|
||||
CONFIG_USB_SERIAL_F81232=y
|
||||
CONFIG_USB_SERIAL_GARMIN=y
|
||||
CONFIG_USB_SERIAL_IPW=y
|
||||
CONFIG_USB_SERIAL_IUU=y
|
||||
CONFIG_USB_SERIAL_KEYSPAN_PDA=y
|
||||
CONFIG_USB_SERIAL_KEYSPAN=y
|
||||
# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
|
||||
# CONFIG_USB_SERIAL_KEYSPAN is not set
|
||||
CONFIG_USB_SERIAL_KLSI=y
|
||||
CONFIG_USB_SERIAL_KOBIL_SCT=y
|
||||
CONFIG_USB_SERIAL_MCT_U232=y
|
||||
CONFIG_USB_SERIAL_METRO=y
|
||||
CONFIG_USB_SERIAL_MOS7720=y
|
||||
CONFIG_USB_SERIAL_MOS7840=y
|
||||
CONFIG_USB_SERIAL_MXUPORT=y
|
||||
# CONFIG_USB_SERIAL_MXUPORT is not set
|
||||
CONFIG_USB_SERIAL_NAVMAN=y
|
||||
CONFIG_USB_SERIAL_PL2303=y
|
||||
CONFIG_USB_SERIAL_OTI6858=y
|
||||
|
|
@ -2739,9 +2739,9 @@ CONFIG_USB_SERIAL_SAFE=y
|
|||
CONFIG_USB_SERIAL_SAFE_PADDED=y
|
||||
CONFIG_USB_SERIAL_SIERRAWIRELESS=y
|
||||
CONFIG_USB_SERIAL_SYMBOL=y
|
||||
CONFIG_USB_SERIAL_TI=y
|
||||
# CONFIG_USB_SERIAL_TI is not set
|
||||
CONFIG_USB_SERIAL_CYBERJACK=y
|
||||
CONFIG_USB_SERIAL_XIRCOM=y
|
||||
# CONFIG_USB_SERIAL_XIRCOM is not set
|
||||
CONFIG_USB_SERIAL_WWAN=y
|
||||
CONFIG_USB_SERIAL_OPTION=y
|
||||
CONFIG_USB_SERIAL_OMNINET=y
|
||||
|
|
@ -2775,7 +2775,7 @@ CONFIG_USB_SERIAL_QT2=y
|
|||
# CONFIG_USB_EHSET_TEST_FIXTURE is not set
|
||||
# CONFIG_USB_ISIGHTFW is not set
|
||||
# CONFIG_USB_YUREX is not set
|
||||
CONFIG_USB_EZUSB_FX2=y
|
||||
# CONFIG_USB_EZUSB_FX2 is not set
|
||||
# CONFIG_USB_HSIC_USB3503 is not set
|
||||
# CONFIG_USB_HSIC_USB4604 is not set
|
||||
# CONFIG_USB_LINK_LAYER_TEST is not set
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ src_prepare() {
|
|||
# Deblob the kernel
|
||||
chmod +x deblob-4.9 deblob-check
|
||||
# Don't use gawk, use sed
|
||||
AWK=dosentexist ./deblob-4.9
|
||||
AWK=dosentexist ./deblob-4.9
|
||||
|
||||
# Remove shipped files
|
||||
find . -name "*_shipped*" -delete
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
|
|||
|
||||
SPDX-License-Identifier: GPL-2.0-only
|
||||
|
||||
Our older version of binutils dosen't play very nicely with binutils for a
|
||||
Our older version of binutils doesn't play very nicely with binutils for a
|
||||
couple of edgecase macros. It seems that ALTERNATIVE is one of these. As we
|
||||
know what your system will be (not Xen), we can manually evaluate and write
|
||||
out the ALTERNATIVEs.
|
||||
|
|
|
|||
|
|
@ -1,10 +1,7 @@
|
|||
<<<<<<< HEAD
|
||||
SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
|
||||
|
||||
SPDX-License-Identifier: GPL-2.0-only
|
||||
|
||||
=======
|
||||
>>>>>>> 1bbc946 (Add kbd-1.15.)
|
||||
--- include/uapi/asm-generic/termios.h.bak 2021-07-23 14:23:51.330460544 +1000
|
||||
+++ include/uapi/asm-generic/termios.h 2021-07-23 19:08:27.112810109 +1000
|
||||
@@ -12,13 +12,6 @@
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
|
||||
# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
95bfa9867c273ae5e5ff8126b377952907b33ff00dd1cf0059aa587c1dfc2ec5 /usr/bin/pkg-config
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
src_prepare() {
|
||||
autoreconf -fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# We use internal glib because standalone glib library depends on
|
||||
# pkg-config and other software (python/meson) that we do not have.
|
||||
./configure \
|
||||
--prefix="${PREFIX}" \
|
||||
--build=i386-unknown-linux-musl \
|
||||
--with-internal-glib
|
||||
}
|
||||
15
sysa/run.sh
15
sysa/run.sh
|
|
@ -7,8 +7,9 @@
|
|||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
set -e
|
||||
# shellcheck source=sysa/helpers.sh
|
||||
# shellcheck source=sysglobal/helpers.sh
|
||||
. helpers.sh
|
||||
# shellcheck source=/dev/null
|
||||
. bootstrap.cfg
|
||||
|
||||
export PREFIX=/usr
|
||||
|
|
@ -16,18 +17,6 @@ export SOURCES=/after
|
|||
mkdir -p "${PREFIX}/sbin"
|
||||
export PATH="${PREFIX}/bin:${PREFIX}/sbin"
|
||||
|
||||
populate_device_nodes() {
|
||||
# http://www.linuxfromscratch.org/lfs/view/6.1/chapter06/devices.html
|
||||
mkdir -p "${1}/dev"
|
||||
test -c "${1}/dev/null" || mknod -m 666 "${1}/dev/null" c 1 3
|
||||
test -c "${1}/dev/zero" || mknod -m 666 "${1}/dev/zero" c 1 5
|
||||
test -c "${1}/dev/ptmx" || mknod -m 666 "${1}/dev/ptmx" c 5 2
|
||||
test -c "${1}/dev/tty" || mknod -m 666 "${1}/dev/tty" c 5 0
|
||||
test -c "${1}/dev/random" || mknod -m 444 "${1}/dev/random" c 1 8
|
||||
test -c "${1}/dev/urandom" || mknod -m 444 "${1}/dev/urandom" c 1 9
|
||||
test -c "${1}/dev/console" || mknod -m 666 "${1}/dev/console" c 5 1
|
||||
}
|
||||
|
||||
create_sysb() {
|
||||
# Copy everything in
|
||||
echo "Creating sysb rootfs"
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
|||
|
||||
We disable the following programs for the following reasons:
|
||||
|
||||
* script: dosen't build with musl.
|
||||
* flock: GCC dosen't like some directive.
|
||||
* fstrim: ??? dosen't build (missing/bad linux header?)
|
||||
* script: doesn't build with musl.
|
||||
* flock: GCC doesn't like some directive.
|
||||
* fstrim: ??? doesn't build (missing/bad linux header?)
|
||||
* fsfreeze: ditto.
|
||||
* hexdump: musl incompatibility.
|
||||
* column: musl incompatibility.
|
||||
|
|
|
|||
|
|
@ -9,13 +9,14 @@ src_prepare() {
|
|||
AUTOPOINT=true autoreconf -fi
|
||||
}
|
||||
|
||||
# --target=i386-unknown-linux-gnu \
|
||||
# --host=i386-unknown-linux-gnu \
|
||||
# --build=i386-unknown-linux-gnu \
|
||||
src_configure() {
|
||||
./configure --prefix=${PREFIX} \
|
||||
--bindir="${PREFIX}/bin" \
|
||||
--sbindir="${PREFIX}/sbin" \
|
||||
--target=i386-unknown-linux-gnu \
|
||||
--host=i386-unknown-linux-gnu \
|
||||
--build=i386-unknown-linux-gnu \
|
||||
--libdir="${PREFIX}/lib/musl" \
|
||||
--disable-libuuid \
|
||||
--without-ncurses \
|
||||
--enable-static \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue