update musl stage generation
This commit is contained in:
parent
7689550ee1
commit
24a82d21d0
1
tools-musl/.gitignore
vendored
1
tools-musl/.gitignore
vendored
|
@ -1,2 +1,3 @@
|
||||||
*log
|
*log
|
||||||
*err
|
*err
|
||||||
|
stage*.conf
|
||||||
|
|
|
@ -1,4 +0,0 @@
|
||||||
=net-analyzer/macchanger-1.7.0-r1 ~amd64
|
|
||||||
=sys-apps/busybox-1.26.2-r1::musl ~amd64
|
|
||||||
=sys-kernel/genkernel-3.5.2.4 ~amd64
|
|
||||||
=app-misc/pax-utils-1.2.2-r2 ~amd64
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
# needed for layman / stage4
|
||||||
|
=net-analyzer/macchanger-1.7.0-r1 ~amd64
|
||||||
|
=dev-libs/openssl-1.0.2o-r6 ~amd64
|
||||||
|
=dev-python/cryptography-2.1.4-r2 ~amd64
|
|
@ -2,3 +2,4 @@ app-admin/syslog-ng -tcpd
|
||||||
sys-apps/kmod lzma # kernel module compression
|
sys-apps/kmod lzma # kernel module compression
|
||||||
sys-apps/util-linux static-libs # for genkernel
|
sys-apps/util-linux static-libs # for genkernel
|
||||||
sys-boot/grub grub_platforms_pc
|
sys-boot/grub grub_platforms_pc
|
||||||
|
dev-lang/python xml sqlite # for layman
|
|
@ -23,7 +23,7 @@ prepare_confs() {
|
||||||
local profile=${flavor}
|
local profile=${flavor}
|
||||||
[[ "${flavor}" == "vanilla" ]] && profile="default"
|
[[ "${flavor}" == "vanilla" ]] && profile="default"
|
||||||
|
|
||||||
cat stage-all.conf.template | \
|
cat stage.conf.template | \
|
||||||
sed -e "s:\(^version_stamp.*$\):\1-${mydate}:" \
|
sed -e "s:\(^version_stamp.*$\):\1-${mydate}:" \
|
||||||
-e "s:CSTAGE:${cstage}:g" \
|
-e "s:CSTAGE:${cstage}:g" \
|
||||||
-e "s:PSTAGE:${pstage}:g" \
|
-e "s:PSTAGE:${pstage}:g" \
|
||||||
|
|
|
@ -63,10 +63,6 @@ main() {
|
||||||
for flavor in hardened vanilla; do
|
for flavor in hardened vanilla; do
|
||||||
do_stages ${arch} ${flavor}
|
do_stages ${arch} ${flavor}
|
||||||
[[ $? == 1 ]] && echo "FAILURE at ${arch} ${flavor} " | tee zzz.log
|
[[ $? == 1 ]] && echo "FAILURE at ${arch} ${flavor} " | tee zzz.log
|
||||||
# (
|
|
||||||
# do_stages ${arch} ${flavor}
|
|
||||||
# [[ $? == 1 ]] && echo "FAILURE at ${arch} ${flavor} " | tee zzz.log
|
|
||||||
# ) &
|
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,10 +2,10 @@ subarch: amd64
|
||||||
target: stage4
|
target: stage4
|
||||||
version_stamp: musl-hardened-MY_DATE
|
version_stamp: musl-hardened-MY_DATE
|
||||||
rel_type: musl/hardened/amd64
|
rel_type: musl/hardened/amd64
|
||||||
profile: hardened/linux/musl/amd64
|
profile: default/linux/amd64/17.0/musl/hardened
|
||||||
snapshot: current
|
snapshot: current
|
||||||
source_subpath: musl/hardened/amd64/stage3-amd64-musl-hardened
|
source_subpath: musl/hardened/amd64/stage3-amd64-musl-hardened
|
||||||
portage_confdir: @REPO_DIR@/portage.amd64.hardened-stage4
|
portage_confdir: @REPO_DIR@/portage.amd64.hardened
|
||||||
portage_overlay: /opt/overlays/musl
|
portage_overlay: /opt/overlays/musl
|
||||||
|
|
||||||
stage4/use:
|
stage4/use:
|
||||||
|
@ -21,6 +21,7 @@ stage4/use:
|
||||||
|
|
||||||
stage4/packages:
|
stage4/packages:
|
||||||
app-admin/syslog-ng
|
app-admin/syslog-ng
|
||||||
|
app-portage/layman
|
||||||
dev-util/pkgconf
|
dev-util/pkgconf
|
||||||
net-misc/dhcpcd
|
net-misc/dhcpcd
|
||||||
sys-apps/iproute2
|
sys-apps/iproute2
|
||||||
|
|
Loading…
Reference in a new issue