Make more project config files optional
`build.packages`, `installonly.packages`, and `busybox.symlinks` are now optional in the `$CONFIGDIR`. If they do exist, they are combined with the same files in the Aimee OS source.gentoo
parent
26b422ed74
commit
d117207bd2
6
Makefile
6
Makefile
|
@ -20,7 +20,7 @@ $(O)/.built: \
|
||||||
build.sh \
|
build.sh \
|
||||||
build.packages \
|
build.packages \
|
||||||
install.packages \
|
install.packages \
|
||||||
$(CONFIGDIR)/build.packages \
|
$(wildcard $(CONFIGDIR)/build.packages) \
|
||||||
$(CONFIGDIR)/install.packages \
|
$(CONFIGDIR)/install.packages \
|
||||||
$(shell find $(CONFIGDIR)/portage/target -type f) \
|
$(shell find $(CONFIGDIR)/portage/target -type f) \
|
||||||
$(O)/.prepared
|
$(O)/.prepared
|
||||||
|
@ -38,8 +38,8 @@ $(O)/.ready: \
|
||||||
build-rootfs.sh \
|
build-rootfs.sh \
|
||||||
install.packages \
|
install.packages \
|
||||||
$(CONFIGDIR)/install.packages \
|
$(CONFIGDIR)/install.packages \
|
||||||
$(CONFIGDIR)/installonly.packages \
|
$(wildcard $(CONFIGDIR)/installonly.packages) \
|
||||||
$(CONFIGDIR)/busybox.symlinks \
|
$(wildcard $(CONFIGDIR)/busybox.symlinks) \
|
||||||
$(O)/linux/arch/arm64/boot/Image.gz \
|
$(O)/linux/arch/arm64/boot/Image.gz \
|
||||||
$(O)/semanage.mods \
|
$(O)/semanage.mods \
|
||||||
$(shell find overlay -type f) \
|
$(shell find overlay -type f) \
|
||||||
|
|
|
@ -33,11 +33,13 @@ ${target}-emerge \
|
||||||
-KvnuUDj \
|
-KvnuUDj \
|
||||||
--rebuilt-binaries=y
|
--rebuilt-binaries=y
|
||||||
|
|
||||||
< "${CONFIGDIR}"/installonly.packages xargs -ro \
|
if [ -f "${CONFIGDIR}"/installonly.packages ]; then
|
||||||
${target}-emerge \
|
< "${CONFIGDIR}"/installonly.packages xargs -ro \
|
||||||
--root=/mnt/gentoo \
|
${target}-emerge \
|
||||||
--config-root="${CONFIGDIR}"/portage/target \
|
--root=/mnt/gentoo \
|
||||||
-vnuUDj
|
--config-root="${CONFIGDIR}"/portage/target \
|
||||||
|
-vnuUDj
|
||||||
|
fi
|
||||||
|
|
||||||
ROOT=/mnt/gentoo \
|
ROOT=/mnt/gentoo \
|
||||||
locale-gen
|
locale-gen
|
||||||
|
@ -52,13 +54,16 @@ mkdir -p \
|
||||||
|
|
||||||
: > /mnt/gentoo/etc/machine-id
|
: > /mnt/gentoo/etc/machine-id
|
||||||
|
|
||||||
while read name; do
|
cat \
|
||||||
|
"${CONFIGDIR}"/busybox.symlinks \
|
||||||
|
busybox.symlinks \
|
||||||
|
| while read name; do
|
||||||
if [ ! -h /mnt/gentoo/bin/"${name}" ]; then
|
if [ ! -h /mnt/gentoo/bin/"${name}" ]; then
|
||||||
printf "'/bin/%s' -> 'busybox'\n" "${name}"
|
printf "'/bin/%s' -> 'busybox'\n" "${name}"
|
||||||
ln -snf busybox /mnt/gentoo/bin/"${name}" \
|
ln -snf busybox /mnt/gentoo/bin/"${name}" \
|
||||||
|| printf 'Failed to create busybox symlink for %s\n' "${name}"
|
|| printf 'Failed to create busybox symlink for %s\n' "${name}"
|
||||||
fi
|
fi
|
||||||
done < "${CONFIGDIR}"/busybox.symlinks
|
done
|
||||||
|
|
||||||
rsync -rltpDO overlay/ /mnt/gentoo/
|
rsync -rltpDO overlay/ /mnt/gentoo/
|
||||||
if [ -d "${CONFIGDIR}"/overlay ]; then
|
if [ -d "${CONFIGDIR}"/overlay ]; then
|
||||||
|
|
|
@ -0,0 +1,62 @@
|
||||||
|
basename
|
||||||
|
cat
|
||||||
|
chcon
|
||||||
|
cp
|
||||||
|
dd
|
||||||
|
df
|
||||||
|
du
|
||||||
|
echo
|
||||||
|
env
|
||||||
|
false
|
||||||
|
free
|
||||||
|
fsync
|
||||||
|
fuser
|
||||||
|
grep
|
||||||
|
groups
|
||||||
|
head
|
||||||
|
id
|
||||||
|
install
|
||||||
|
ip
|
||||||
|
kill
|
||||||
|
less
|
||||||
|
link
|
||||||
|
ln
|
||||||
|
ls
|
||||||
|
lsof
|
||||||
|
mkdir
|
||||||
|
mkfifo
|
||||||
|
mktemp
|
||||||
|
mv
|
||||||
|
nice
|
||||||
|
nproc
|
||||||
|
pgrep
|
||||||
|
ping
|
||||||
|
ping6
|
||||||
|
pkill
|
||||||
|
ppidof
|
||||||
|
printf
|
||||||
|
ps
|
||||||
|
readahead
|
||||||
|
readlink
|
||||||
|
realpath
|
||||||
|
rm
|
||||||
|
rmdir
|
||||||
|
sed
|
||||||
|
seq
|
||||||
|
sh
|
||||||
|
sha1sum
|
||||||
|
sha256sum
|
||||||
|
sha3sum
|
||||||
|
sha512sum
|
||||||
|
sort
|
||||||
|
stat
|
||||||
|
stty
|
||||||
|
sync
|
||||||
|
tac
|
||||||
|
tail
|
||||||
|
tar
|
||||||
|
tee
|
||||||
|
truncate
|
||||||
|
tty
|
||||||
|
uname
|
||||||
|
uptime
|
Loading…
Reference in New Issue