tools-musl: fix .gitignore and missed files
This commit is contained in:
parent
1b33ae243f
commit
a7dae541f2
4
tools-musl/.gitignore
vendored
4
tools-musl/.gitignore
vendored
|
@ -1,2 +1,2 @@
|
||||||
stage*
|
*log
|
||||||
*.log
|
*err
|
||||||
|
|
12
tools-musl/stage-all.conf.template
Normal file
12
tools-musl/stage-all.conf.template
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
subarch: SARCH
|
||||||
|
target: CSTAGE
|
||||||
|
version_stamp: musl-FLAVOR
|
||||||
|
rel_type: FLAVOR/SARCH
|
||||||
|
profile: hardened/linux/musl/PARCH
|
||||||
|
snapshot: current
|
||||||
|
source_subpath: FLAVOR/SARCH/PSTAGE-SARCH-musl-FLAVOR
|
||||||
|
chost: TARCH-gentoo-linux-musl
|
||||||
|
cflags: -O2 -pipe -fomit-frame-pointer
|
||||||
|
cxxflags: -O2 -pipe -fomit-frame-pointer
|
||||||
|
portage_confdir: MYCATALYST/portage.SARCH.FLAVOR
|
||||||
|
portage_overlay: /var/lib/layman/hardened-development
|
11
tools-musl/stage4/README
Normal file
11
tools-musl/stage4/README
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
|
||||||
|
This is not ready yet for a full catalyst run. However,
|
||||||
|
if you have a musl chroot (which you can get from any
|
||||||
|
gentoo mirror off of /experimental/amd64/musl) then you
|
||||||
|
can build a new stage by running ./run.sh. It basically
|
||||||
|
uses the `ROOT=rootfs emerge -e @system` technique.
|
||||||
|
|
||||||
|
Once more stuff is integrated into gentoo, we will replace
|
||||||
|
this with a catalyst scripts.
|
||||||
|
|
||||||
|
Anthony G. Basile <blueness@gentoo.org>
|
1
tools-musl/stage4/portage.mips/env/libintl.conf
vendored
Normal file
1
tools-musl/stage4/portage.mips/env/libintl.conf
vendored
Normal file
|
@ -0,0 +1 @@
|
||||||
|
LDFLAGS=-lintl
|
1
tools-musl/stage4/portage.mips/env/parallel.conf
vendored
Normal file
1
tools-musl/stage4/portage.mips/env/parallel.conf
vendored
Normal file
|
@ -0,0 +1 @@
|
||||||
|
MAKEOPTS=-j1
|
16
tools-musl/stage4/portage.mips/make.conf
Normal file
16
tools-musl/stage4/portage.mips/make.conf
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
CHOST=MY_CHOST
|
||||||
|
CFLAGS="-Os -pipe -fomit-frame-pointerMY_CFLAGS"
|
||||||
|
CXXFLAGS="${CFLAGS}"
|
||||||
|
|
||||||
|
USE="-hardened -fortran -mudflap"
|
||||||
|
USE="${USE} -xattr python zlib"
|
||||||
|
|
||||||
|
MAKEOPTS="-j9"
|
||||||
|
|
||||||
|
INSTALL_MASK="charset.alias"
|
||||||
|
PORTDIR="/usr/portage"
|
||||||
|
|
||||||
|
source /var/lib/layman/make.conf
|
||||||
|
|
||||||
|
GENTOO_MIRRORS="ftp://192.168.3.1/pub/gentoo"
|
||||||
|
SYNC="rsync://192.168.3.1/portage"
|
7
tools-musl/stage4/portage.mips/package.env
Normal file
7
tools-musl/stage4/portage.mips/package.env
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
dev-vcs/git libintl.conf
|
||||||
|
sys-apps/kbd libintl.conf
|
||||||
|
sys-apps/man-db parallel.conf
|
||||||
|
sys-apps/net-tools libintl.conf
|
||||||
|
sys-fs/e2fsprogs libintl.conf
|
||||||
|
sys-fs/eudev libintl.conf
|
||||||
|
sys-process/procps libintl.conf
|
9
tools-musl/stage4/portage.mips/package.mask
Normal file
9
tools-musl/stage4/portage.mips/package.mask
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
>app-misc/pax-utils-0.7
|
||||||
|
>dev-libs/glib-2.36.4-r99
|
||||||
|
>sys-apps/kbd-1.15.5-r99
|
||||||
|
>sys-apps/net-tools-1.60_p20120127084908-r99
|
||||||
|
>sys-apps/util-linux-2.23.1-r99
|
||||||
|
sys-apps/systemd
|
||||||
|
>sys-devel/gcc-4.7.3-r99
|
||||||
|
sys-fs/udev
|
||||||
|
>sys-process/procps-3.3.8-r99
|
3
tools-musl/stage4/portage.mips/package.use
Normal file
3
tools-musl/stage4/portage.mips/package.use
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
dev-vcs/git -gpg
|
||||||
|
sys-fs/e2fsprogs -nls
|
||||||
|
sys-apps/busybox -* savedconfig
|
7
tools-musl/stage4/portage.mips/repos.conf/gentoo.conf
Normal file
7
tools-musl/stage4/portage.mips/repos.conf/gentoo.conf
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
[DEFAULT]
|
||||||
|
main-repo = gentoo
|
||||||
|
|
||||||
|
[gentoo]
|
||||||
|
location = /usr/portage
|
||||||
|
sync-type = rsync
|
||||||
|
sync-uri = rsync://192.168.3.1/portage
|
File diff suppressed because it is too large
Load diff
127
tools-musl/stage4/run.sh
Executable file
127
tools-musl/stage4/run.sh
Executable file
|
@ -0,0 +1,127 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
TEST_ARCH=$(file -b /usr/lib/libc.so | sed -e 's/^.*shared object, //' -e 's/,.*$//')
|
||||||
|
|
||||||
|
if [[ "${TEST_ARCH}" == "Intel 80386" ]]; then
|
||||||
|
MY_ARCH="i686"
|
||||||
|
MY_CHOST="i686-gentoo-linux-musl"
|
||||||
|
MY_CFLAGS=""
|
||||||
|
MY_PROF="x86"
|
||||||
|
MY_PATH="i386"
|
||||||
|
elif [[ "${TEST_ARCH}" == "x86-64" ]]; then
|
||||||
|
MY_ARCH="amd64"
|
||||||
|
MY_CHOST="x86_64-gentoo-linux-musl"
|
||||||
|
MY_CFLAGS=""
|
||||||
|
MY_PROF="amd64"
|
||||||
|
MY_PATH="x86_64"
|
||||||
|
elif [[ "${TEST_ARCH}" == "ARM" ]]; then
|
||||||
|
# Need better logic for alternative subarches and hard/softfloat
|
||||||
|
MY_ARCH="armv7a_hardfp"
|
||||||
|
MY_CHOST="armv7a-hardfloat-linux-musleabi"
|
||||||
|
MY_CFLAGS=" -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
|
||||||
|
MY_PROF="arm/armv7a"
|
||||||
|
MY_PATH="armhf"
|
||||||
|
elif [[ "${TEST_ARCH}" == "MIPS" ]]; then
|
||||||
|
MY_ARCH="MIPS"
|
||||||
|
MY_CHOST="mipsel-gentoo-linux-musl"
|
||||||
|
MY_CFLAGS=""
|
||||||
|
MY_PROF="mips/mipsel"
|
||||||
|
MY_PATH="mipsel"
|
||||||
|
else
|
||||||
|
echo "Unsupported arch $TEST_ARCH"
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
|
||||||
|
ROOTFS="stage4-${MY_ARCH}-musl-vanilla"
|
||||||
|
PWD="$(pwd)"
|
||||||
|
|
||||||
|
prepare_etc () {
|
||||||
|
mkdir -p "${ROOTFS}"/etc
|
||||||
|
if [[ "${MY_ARCH}" == "MIPS" ]]; then
|
||||||
|
cp -a "${PWD}"/portage.mips/ "${ROOTFS}"/etc/portage
|
||||||
|
else
|
||||||
|
cp -a "${PWD}"/portage/ "${ROOTFS}"/etc/
|
||||||
|
fi
|
||||||
|
sed -i "s/MY_CHOST/${MY_CHOST}/" "${ROOTFS}"/etc/portage/make.conf
|
||||||
|
sed -i "s/MY_CFLAGS/${MY_CFLAGS}/" "${ROOTFS}"/etc/portage/make.conf
|
||||||
|
ln -sf ../../usr/portage/profiles/hardened/linux/musl/"${MY_PROF}" "${ROOTFS}"/etc/portage/make.profile
|
||||||
|
}
|
||||||
|
|
||||||
|
prepare_usr_etc() {
|
||||||
|
mkdir -p "${ROOTFS}"/usr/etc
|
||||||
|
|
||||||
|
cat <<-EOF > "${ROOTFS}"/usr/etc/ld-musl-${MY_PATH}.path
|
||||||
|
/lib
|
||||||
|
/usr/lib
|
||||||
|
/usr/lib/gcc/${MY_CHOST}/4.7.3
|
||||||
|
/usr/${MY_CHOST}/lib
|
||||||
|
EOF
|
||||||
|
|
||||||
|
# mips-muls needs some tlc upstream
|
||||||
|
if [[ "${MY_ARCH}" == "MIPS" ]]; then
|
||||||
|
ln -sf ld-musl-${MY_PATH}.path "${ROOTFS}"/etc/ld-musl.path
|
||||||
|
else
|
||||||
|
ln -sf ld-musl-${MY_PATH}.path "${ROOTFS}"/usr/etc/ld-musl.path
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
prepare_overlay() {
|
||||||
|
# This is intensely ugly, but for now ...
|
||||||
|
mkdir -p "${ROOTFS}"/var/lib/layman/
|
||||||
|
cp -a /var/lib/layman/* "${ROOTFS}"/var/lib/layman/
|
||||||
|
}
|
||||||
|
|
||||||
|
emerge_system() {
|
||||||
|
ROOT="${ROOTFS}" emerge --keep-going --with-bdeps=y -uvq @system
|
||||||
|
FEATURES="-sandbox" ROOT="${ROOTFS}" emerge --keep-going --with-bdeps=y -uvq sandbox
|
||||||
|
}
|
||||||
|
|
||||||
|
mk_top_level_dirs() {
|
||||||
|
mkdir "${ROOTFS}"/{boot,dev,home,media,mnt,opt,proc,root,sys}
|
||||||
|
}
|
||||||
|
|
||||||
|
setup_configs() {
|
||||||
|
sed -i '/^SYNC/d' "${ROOTFS}"/etc/portage/make.conf
|
||||||
|
sed -i '/^GENTOO_MIRRORS/d' "${ROOTFS}"/etc/portage/make.conf
|
||||||
|
sed -i 's/^MAKEOPTS/#MAKEOPTS/' "${ROOTFS}"/etc/portage/make.conf
|
||||||
|
|
||||||
|
# There are some issue with python3, so let's select python2
|
||||||
|
# which so far is option 1 in elesect python.
|
||||||
|
chroot "${ROOTFS}" eselect python set 1
|
||||||
|
}
|
||||||
|
|
||||||
|
bundle_it() {
|
||||||
|
local DATE=$(date +%Y%m%d)
|
||||||
|
local NAME="${ROOTFS}"-"${DATE}".tar.bz2
|
||||||
|
local DIGESTS="${NAME}".DIGESTS
|
||||||
|
|
||||||
|
cd "${ROOTFS}"
|
||||||
|
tar -j -c -f ../"${NAME}" .
|
||||||
|
|
||||||
|
cd ..
|
||||||
|
>"${DIGESTS}"
|
||||||
|
|
||||||
|
echo "# MD5 HASH" >> "${DIGESTS}"
|
||||||
|
md5sum "${NAME}" >> "${DIGESTS}"
|
||||||
|
|
||||||
|
echo "# SHA1 HASH" >> "${DIGESTS}"
|
||||||
|
sha1sum "${NAME}" >> "${DIGESTS}"
|
||||||
|
|
||||||
|
echo "# SHA512 HASH" >> "${DIGESTS}"
|
||||||
|
sha512sum "${NAME}" >> "${DIGESTS}"
|
||||||
|
|
||||||
|
echo "# WHIRLPOOL HASH" >> "${DIGESTS}"
|
||||||
|
whirlpooldeep "${NAME}" >> "${DIGESTS}"
|
||||||
|
}
|
||||||
|
|
||||||
|
main (){
|
||||||
|
prepare_etc
|
||||||
|
prepare_usr_etc
|
||||||
|
prepare_overlay
|
||||||
|
emerge_system
|
||||||
|
mk_top_level_dirs
|
||||||
|
setup_configs
|
||||||
|
bundle_it
|
||||||
|
}
|
||||||
|
|
||||||
|
main > zzz.log 2>&1 &
|
Loading…
Reference in a new issue