dustin
/
aimee-os
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: dustin:a776a5aa964708e6f09990f8367852458ce40e39
Branches Tags
dustin:master
...
compare: dustin:b19c0941a7437613bae9813f05c301c5936db545
Branches Tags
dustin:master

6 Commits
a776a5aa96 ... b19c0941a7

Author SHA1 Message Date
Dustin b19c0941a7 squashfs: Omit /usr/lib/udev/hwdb.d 
This path is redundant and not necesssary on the installed system.
 2023-02-14 21:09:13 -06:00
Dustin c91bff6f6d Makefile: Allow rebuilding just the squashfs image 
This way we can rebuild the image even if nothing changed in the root
filesystem, but the excluded path list did.
 2023-02-14 21:08:27 -06:00
Dustin 3980daefd3 firmware: Fix WiFi firmware file path 
The kernel expects the `.txt` file to end with the `.xz` extension.
 2023-02-14 21:07:35 -06:00
Dustin fe3cc25f6b fstab: Only overlay /etc/ssh 
There's really no sense in creating a writable copy of the whole `/etc`
hierarchy at `/run/etc/rw`.  Instead, let's just mount overlays at the
paths we want to make writable (which for now is only `/etc/ssh`).
 2023-02-14 21:05:54 -06:00
Dustin f182a4329b Remove unused locales 
This reduces the size of the (compressed) image by a few megabytes.
 2023-02-14 19:51:27 -06:00
Dustin e99049e462 portage: Fix typos 2023-02-14 00:50:13 -06:00
10 changed files with 19 additions and 5 deletions
Show Stats Expand all files Collapse all files

9
Makefile
View File

@ -21,15 +21,20 @@ prepare: .prepared
host-tools: .host-tools host-tools: .host-tools
images/rootfs.squashfs: \ .built: \
build.sh \ build.sh \
build-rootfs.sh \ build-rootfs.sh \
build-squashfs.sh \
linux/arch/arm64/boot/Image.gz \ linux/arch/arm64/boot/Image.gz \
.host-tools \ .host-tools \
.prepared .prepared
./build.sh ./build.sh
./build-rootfs.sh ./build-rootfs.sh
touch .built
images/rootfs.squashfs: \
build-squashfs.sh \
squashfs.exclude \
.built
./build-squashfs.sh ./build-squashfs.sh
squashfs: images/rootfs.squashfs squashfs: images/rootfs.squashfs

3
build-rootfs.sh
View File

@ -38,6 +38,9 @@ ${target}-emerge -vnj \
sys-kernel/linux-firmware \ sys-kernel/linux-firmware \
-- --
ROOT=/mnt/gentoo \
locale-gen
mkdir -p \ mkdir -p \
/mnt/gentoo/boot/efi \ /mnt/gentoo/boot/efi \
/mnt/gentoo/dev \ /mnt/gentoo/dev \

3
overlay/etc/fstab
View File

@ -1,4 +1,3 @@
PARTLABEL=dch-data /var btrfs subvol=var,nosuid,noexec,nodev 0 2 PARTLABEL=dch-data /var btrfs subvol=var,nosuid,noexec,nodev 0 2
PARTLABEL=dch-data /run/etc btrfs subvol=etc,nosuid,noexec,nodev 0 0 PARTLABEL=dch-data /run/etc btrfs subvol=etc,nosuid,noexec,nodev 0 0
overlay /run/etc/rw overlay lowerdir=/etc,upperdir=/run/etc/rw,workdir=/run/etc/.work 0 0 overlay /etc/ssh overlay lowerdir=/etc/ssh,upperdir=/run/etc/rw/ssh,workdir=/run/etc/.work,x-systemd.requires=run-etc.mount 0 0
/run/etc/rw/ssh /etc/ssh none bind 0 0

1
overlay/etc/locale.conf Normal file
View File

@ -0,0 +1 @@
LANG=en_US.UTF-8

1
overlay/etc/locale.gen Normal file
View File

@ -0,0 +1 @@
en_US.UTF-8 UTF-8

0
overlay/usr/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module-ha-yellow.txt → overlay/usr/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module-ha-yellow.txt.xz
View File

1
overlay/usr/libexec/init-storage
View File

@ -28,6 +28,7 @@ format_dev() {
mount "${dev}" "${tmpdir}" || exit mount "${dev}" "${tmpdir}" || exit
btrfs subvolume create "${tmpdir}"/etc || exit btrfs subvolume create "${tmpdir}"/etc || exit
mkdir -p "${tmpdir}"/etc/.work "${tmpdir}"/etc/rw || exit mkdir -p "${tmpdir}"/etc/.work "${tmpdir}"/etc/rw || exit
mkdir -p "${tmpdir}"/etc/rw/ssh
btrfs subvolume create "${tmpdir}"/var || exit btrfs subvolume create "${tmpdir}"/var || exit
btrfs subvolume create "${tmpdir}"/var/log || exit btrfs subvolume create "${tmpdir}"/var/log || exit
umount "${dev}" || exit umount "${dev}" || exit

3
portage/make.conf/40-lang.conf Normal file
View File

@ -0,0 +1,3 @@
LINGUAS=en
L10N=en-US
USE="${USE} -nls"

2
portage/package.env/linux-firmware
View File

@ -1 +1 @@
sys-kernel/linux-formware nobinpkg sys-kernel/linux-firmware nobuildpkg

1
squashfs.exclude
View File

@ -16,6 +16,7 @@ usr/lib*/cmake
usr/lib*/pkgconfig usr/lib*/pkgconfig
usr/lib/kernel usr/lib/kernel
usr/lib/rpm usr/lib/rpm
usr/lib/udev/hwdb.d
usr/local usr/local
usr/share/aclocal usr/share/aclocal
usr/share/baselayout usr/share/baselayout