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

Compare commits

base: AimeeOS:554063e1f4e316a6d3087a27076e0c6d5a34fca1
Branches Tags
AimeeOS:master AimeeOS:dev/gentoo AimeeOS:gentoo
AimeeOS:2.0dev
...
compare: AimeeOS:36429459e1f40de0989189d2b8296e73be81a602
Branches Tags
AimeeOS:master AimeeOS:dev/gentoo AimeeOS:gentoo
AimeeOS:2.0dev

3 Commits
554063e1f4 ... 36429459e1

Author SHA1 Message Date
Dustin C. Hatch
36429459e1 build-rootfs: Relocate misplaced PAM libs 
Some packages, notably _systemd_, place their PAM modules in
`/usr/lib64/security` instead of `/usr/lib/security`.  PAM only seems to
look in the latter location, though, so anything in the former needs to
be moved in order to be used.
 2024-12-30 17:16:40 -06:00
Dustin C. Hatch
5bce7dfab3 build-rootfs: Copy GCC libs to target 
Software written in C++ typically depends on `libstdc++.so.6` and
`libgcc_s.so.1`.  These library dependencies are implicit, as Gentoo
expects GCC to be installed as part of the _@system_ set.  Since that
set does not get installed in the target root, anything that depends on
those libraries will not function.

Rather than install _sys-devel/gcc_ in the target environment to get
those libraries, we can copy ones built by `crossdev` manually.  This
way, we do not end up with a full C compiler and development toolchain
in the target environment, while still making the libraries available
for applications that need them.
 2024-12-30 13:15:00 -06:00
Dustin C. Hatch
c30da6a5ff prepare: disable preserve-libs for glibc 
Since installing _sys-libs/glibc_ in the crossdev root overwrites the
libraries built by crossdev, Portage records the latter as needing to be
protected.  This results in _everything_ being pulled in to
@preserved-rebuild, which ultimately does nothing since the preserved
library is never replaced.  To avoid this pointlessness, we need to
disable the _preserve-libs_ feature when reinstalling _glibc_.

We also disable _protect-owned_ to avoid spam from Portage when
initially overwriting the libraries and headers in the crossdev root.
 2024-12-29 15:02:25 -06:00
2 changed files with 13 additions and 1 deletions
Expand all files Collapse all files

12
build-rootfs.sh
View File

@@ -76,11 +76,23 @@ if [ -f /mnt/gentoo/etc/udev/hwdb.bin ]; then
mv /mnt/gentoo/etc/udev/hwdb.bin /mnt/gentoo/usr/lib/udev/
fi
gccver=$(qlist -I -F '%{PV}' cross-${target}/gcc | sed 's/[^0-9].*//')
for lib in \
libstdc++ \
libgcc_s \
; do
cp /usr/lib/gcc/${target}/${gccver}/${lib}.so.* /mnt/gentoo/usr/lib64/
done
qemu-${target%%-*} \
/mnt/gentoo/usr/sbin/ldconfig \
-r /mnt/gentoo \
-f /mnt/gentoo/etc/ld.so.conf
if [ -d /mnt/gentoo/lib64/security ]; then
mv /mnt/gentoo/lib64/security/pam_*.so /mnt/gentoo/lib/security/
fi
rm -f /mnt/gentoo/lib/tmpfiles.d/provision.conf
systemd-tmpfiles --root=/mnt/gentoo -E --exclude-prefix=/var --create

2
prepare.sh
View File

@@ -42,7 +42,7 @@ if [ ! -f portage/make.conf/10-crossdev.conf ]; then
> "${O}"/portage/etc/portage/make.conf/10-crossdev.conf
fi
FEATURES="${FEATURES}" \
FEATURES="${FEATURES} -preserve-libs -protect-owned" \
PKGDIR="${PKGDIR}" \
${target}-emerge -bk1nvj sys-libs/glibc