diff options
35 files changed, 381 insertions, 8 deletions
diff --git a/profiles/make.defaults b/profiles/make.defaults deleted file mode 100644 index 92ac6f4..0000000 --- a/profiles/make.defaults +++ /dev/null @@ -1 +0,0 @@ -ARCH=amd64 diff --git a/profiles/systemd/package.mask b/profiles/systemd/package.mask deleted file mode 100644 index 734825c..0000000 --- a/profiles/systemd/package.mask +++ /dev/null @@ -1 +0,0 @@ -sys-apps/openrc diff --git a/profiles/systemd/packages b/profiles/systemd/packages deleted file mode 100644 index 2a1d244..0000000 --- a/profiles/systemd/packages +++ /dev/null @@ -1 +0,0 @@ --*sys-apps/openrc diff --git a/profiles/systemd/parent b/profiles/systemd/parent deleted file mode 100644 index eb4d905..0000000 --- a/profiles/systemd/parent +++ /dev/null @@ -1 +0,0 @@ -../ diff --git a/profiles/systemd/eapi b/profiles/targets/musl/amd64/eapi index 7ed6ff8..7ed6ff8 100644 --- a/profiles/systemd/eapi +++ b/profiles/targets/musl/amd64/eapi diff --git a/profiles/targets/musl/amd64/make.defaults b/profiles/targets/musl/amd64/make.defaults new file mode 100644 index 0000000..496becb --- /dev/null +++ b/profiles/targets/musl/amd64/make.defaults @@ -0,0 +1,28 @@ +# Copyright 1999-2015 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +ARCH="amd64" +ACCEPT_KEYWORDS="${ARCH}" + +CHOST="x86_64-gentoo-linux-musl" +CFLAGS="-O2 -pipe" +CXXFLAGS="${CFLAGS}" +FFLAGS="${CFLAGS}" +FCFLAGS="${CFLAGS}" + +# Anthony G. Basile <blueness@gentoo.org> (01 Jul 2014) +# Multilib-related setup, bug #515130 +ABI="amd64" +DEFAULT_ABI="amd64" +MULTILIB_ABIS="amd64" +CHOST_amd64="${CHOST}" +LIBDIR_amd64="lib" +IUSE_IMPLICIT="abi_x86_64" + +# Anthony G. Basile <blueness@gentoo.org> (31 Aug 2015) +# Relect these flags from arch/amd64 which we don't inherit +CPU_FLAGS_X86="mmx mmxext sse sse2" + +# Anthony G. Basile <blueness@gentoo.org> (26 Jan 2013) +# Unhide the CPU_FLAGS_X86 USE_EXPANDs. +USE_EXPAND_HIDDEN="-CPU_FLAGS_X86" diff --git a/profiles/targets/musl/amd64/package.mask b/profiles/targets/musl/amd64/package.mask new file mode 100644 index 0000000..2d46a56 --- /dev/null +++ b/profiles/targets/musl/amd64/package.mask @@ -0,0 +1,7 @@ +# Copyright 1999-2015 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +# Ulrich Müller <ulm@gentoo.org> (18 Mar 2013) +# Packages that rely on multilib +=app-editors/emacs-18* +net-misc/icaclient diff --git a/profiles/targets/musl/amd64/package.use.force b/profiles/targets/musl/amd64/package.use.force new file mode 100644 index 0000000..ca264fe --- /dev/null +++ b/profiles/targets/musl/amd64/package.use.force @@ -0,0 +1,7 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Michał Górny <mgorny@gentoo.org> (24 Sep 2016) +# Force the host target to avoid dependency hell +sys-devel/clang llvm_targets_X86 +sys-devel/llvm llvm_targets_X86 diff --git a/profiles/targets/musl/amd64/package.use.mask b/profiles/targets/musl/amd64/package.use.mask new file mode 100644 index 0000000..49830f8 --- /dev/null +++ b/profiles/targets/musl/amd64/package.use.mask @@ -0,0 +1,2 @@ +# Copyright 1999-2017 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 diff --git a/profiles/targets/musl/amd64/parent b/profiles/targets/musl/amd64/parent new file mode 100644 index 0000000..f3229c5 --- /dev/null +++ b/profiles/targets/musl/amd64/parent @@ -0,0 +1 @@ +.. diff --git a/profiles/targets/musl/amd64/use.force b/profiles/targets/musl/amd64/use.force new file mode 100644 index 0000000..181cb39 --- /dev/null +++ b/profiles/targets/musl/amd64/use.force @@ -0,0 +1,6 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Force the flag which corresponds to arch/abi, bug #515130 +amd64 +abi_x86_64 diff --git a/profiles/targets/musl/amd64/use.mask b/profiles/targets/musl/amd64/use.mask new file mode 100644 index 0000000..cc3b7ca --- /dev/null +++ b/profiles/targets/musl/amd64/use.mask @@ -0,0 +1,35 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Force the flag which corresponds to arch/abi, bug #515130 +-amd64 +-abi_x86_64 + +# unmask all SIMD assembler flags +-cpu_flags_x86_3dnow +-cpu_flags_x86_3dnowext +-cpu_flags_x86_aes +-cpu_flags_x86_avx +-cpu_flags_x86_avx2 +-cpu_flags_x86_fma3 +-cpu_flags_x86_fma4 +-cpu_flags_x86_mmx +-cpu_flags_x86_mmxext +-cpu_flags_x86_padlock +-cpu_flags_x86_popcnt +-cpu_flags_x86_sse +-cpu_flags_x86_sse2 +-cpu_flags_x86_sse3 +-cpu_flags_x86_sse4_1 +-cpu_flags_x86_sse4_2 +-cpu_flags_x86_sse4a +-cpu_flags_x86_ssse3 +-cpu_flags_x86_xop + +# Lilo works on amd64 +-lilo + +# These work +-input_devices_synaptics +-input_devices_wacom +-video_cards_qxl diff --git a/profiles/targets/musl/eapi b/profiles/targets/musl/eapi new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/profiles/targets/musl/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/targets/musl/make.defaults b/profiles/targets/musl/make.defaults new file mode 100644 index 0000000..ec5b4ed --- /dev/null +++ b/profiles/targets/musl/make.defaults @@ -0,0 +1,15 @@ +# Copyright 1999-2014 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +ELIBC="musl" + +FEATURES="sandbox sfperms strict" + +USE="hardened nptl pax_kernel pic unicode -berkdb -jit -orc" +BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened nptl pax_kernel pic -berkdb -jit -nls -orc" + +SYMLINK_LIB="no" + +# TODO: fix so musl doesn't generate this for all packages +# that use a charset, it causes package collisons. +INSTALL_MASK="charset.alias" diff --git a/profiles/targets/musl/package.mask b/profiles/targets/musl/package.mask new file mode 100644 index 0000000..b636d32 --- /dev/null +++ b/profiles/targets/musl/package.mask @@ -0,0 +1,110 @@ +# Copyright 1999-2017 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +sys-libs/uclibc +sys-libs/uclibc-ng +sys-libs/glibc + +# Older versions of net-mail/mailutils fail on musl, bug #604212 +<net-mail/mailutils-3.2 + +# We use eudev which is tested on both uclibc and musl +sys-apps/systemd +sys-fs/udev +# +dev-libs/elfutils + +# packages that need masked packages or multilib +dev-games/gtkradiant +dev-games/ps2-packer +games-action/beathazardultra +games-action/brutal-legend +games-action/descent3 +games-action/descent3-demo +games-action/heretic2-demo +games-action/hotline-miami +games-action/intrusion2 +games-action/rune +games-action/shadowgrounds-bin +games-action/shadowgrounds-survivor-bin +games-action/solar2 +games-action/spacetripper-demo +games-action/swordandsworcery +games-action/trine-bin +games-action/trine2 +games-arcade/aquaria +games-arcade/barbarian-bin +games-arcade/dynamitejack +games-arcade/jardinains +games-arcade/marbleblastgold-demo +games-arcade/thinktanks-demo +games-emulation/nestra +games-emulation/zinc +games-emulation/zsnes +games-fps/enemy-territory +games-fps/enemy-territory-etpro +games-fps/enemy-territory-truecombat +games-fps/etqw-demo +games-fps/glxquake-bin +games-fps/legends +games-fps/postal2mp-demo +games-fps/quake3-bin +games-fps/quake3-demo +games-fps/rtcwmp-demo +games-fps/rtcwsp-demo +games-fps/soldieroffortune +games-fps/soldieroffortune-demo +games-fps/transfusion-bin +games-fps/tribes2 +games-fps/ut2003 +games-fps/ut2003-bonuspack-cm +games-fps/ut2003-bonuspack-de +games-fps/ut2003-bonuspack-epic +games-fps/ut2003-demo +games-fps/ut2004 +games-fps/ut2004-action +games-fps/ut2004-airbuccaneers +games-fps/ut2004-bonuspack-cbp1 +games-fps/ut2004-bonuspack-cbp2 +games-fps/ut2004-bonuspack-ece +games-fps/ut2004-bonuspack-mega +games-fps/ut2004-cor +games-fps/ut2004-crossfire +games-fps/ut2004-data +games-fps/ut2004-deathball +games-fps/ut2004-demo +games-fps/ut2004-fragops +games-fps/ut2004-hamsterbash +games-fps/ut2004-muralis +games-fps/ut2004-strikeforce +games-fps/ut2004-troopers +games-fps/ut2004-unwheel +games-kids/crayon-physics +games-misc/little-inferno +games-misc/papers-please +games-puzzle/hoh-bin +games-puzzle/world-of-goo +games-puzzle/world-of-goo-demo +games-roguelike/adom +games-rpg/dear-esther +games-rpg/dungeon-defenders +games-rpg/eschalon-book-1-demo +games-rpg/nwmouse +games-rpg/penumbra-collection +games-rpg/wasteland2 +games-server/etqw-ded +games-server/ut2004-ded +games-simulation/bcs-demo +games-strategy/darwinia +games-strategy/darwinia-demo +games-strategy/defcon-demo +games-strategy/dominions2 +games-strategy/knights-demo +games-strategy/majesty-demo +media-video/binkplayer + +# Ian Stakenvicius, 2017-06-14 +# on behalf of mozilla@gentoo.org +# Mask firefox-54 and above as it requires rust +# now, and rust reportedly will not build yet. +>=www-client/firefox-54.0 diff --git a/profiles/targets/musl/package.use b/profiles/targets/musl/package.use new file mode 100644 index 0000000..2d99b60 --- /dev/null +++ b/profiles/targets/musl/package.use @@ -0,0 +1,7 @@ +# Copyright 1999-2016 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +# Anthony G. Basile <blueness@gentoo.org> (14 Jul 2016) +# We need this to break a circular dependency with +# 'sys-libs/libcap pam' in stage3 catalyst builds +sys-libs/pam -filecaps diff --git a/profiles/targets/musl/package.use.force b/profiles/targets/musl/package.use.force new file mode 100644 index 0000000..8122d90 --- /dev/null +++ b/profiles/targets/musl/package.use.force @@ -0,0 +1,9 @@ +# Copyright 1999-2015 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +# Force system-libevent use flag on mozilla packages, since the building of +# bundled libevent cannot accomodate a system without sysctl.h +# See bug 574830 for more info. +>=www-client/firefox-45.0 system-libevent +>=www-client/seamonkey-2.40 system-libevent +>=mail-client/thunderbird-45.0 system-libevent diff --git a/profiles/targets/musl/package.use.mask b/profiles/targets/musl/package.use.mask new file mode 100644 index 0000000..d66f247 --- /dev/null +++ b/profiles/targets/musl/package.use.mask @@ -0,0 +1,24 @@ +# Copyright 1999-2015 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +# Matthias Maier <tamiko@genoto.org> (11 May 2017) +# masked in base, unmask for hardened/musl/ +sys-devel/gcc -pie + +# See bug #504200 +sys-devel/gcc sanitize + +# llvm's sanitizers are also incompatible with musl +sys-devel/llvm sanitize + +# These cause collisions with <libintl.h> +# even with --without-included-gettext +sys-devel/gettext nls +sys-fs/e2fsprogs nls + +# Broken +dev-vcs/git gpg + +# See bug #576928 +media-libs/mesa nptl +x11-base/xorg-server nptl diff --git a/profiles/targets/musl/packages b/profiles/targets/musl/packages new file mode 100644 index 0000000..8e9700f --- /dev/null +++ b/profiles/targets/musl/packages @@ -0,0 +1,6 @@ +# Copyright 1999-2014 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +*app-misc/pax-utils +*sys-apps/sandbox +-*sys-apps/man-pages diff --git a/profiles/targets/musl/packages.build b/profiles/targets/musl/packages.build new file mode 100644 index 0000000..c07961a --- /dev/null +++ b/profiles/targets/musl/packages.build @@ -0,0 +1,10 @@ +# Copyright 1999-2014 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +# This file lists extra packages needed to build for +# a stage 1 based on this profile. + +dev-util/pkgconf +sys-apps/attr +sys-apps/sandbox +dev-python/pyxattr diff --git a/profiles/targets/musl/use.force b/profiles/targets/musl/use.force new file mode 100644 index 0000000..79e5575 --- /dev/null +++ b/profiles/targets/musl/use.force @@ -0,0 +1,4 @@ +# Copyright 1999-2013 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +elibc_musl diff --git a/profiles/targets/musl/use.mask b/profiles/targets/musl/use.mask new file mode 100644 index 0000000..190b01b --- /dev/null +++ b/profiles/targets/musl/use.mask @@ -0,0 +1,8 @@ +# Copyright 1999-2015 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +-elibc_musl +elibc_uclibc +elibc_glibc + +-hardened diff --git a/profiles/targets/musl/x86/eapi b/profiles/targets/musl/x86/eapi new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/profiles/targets/musl/x86/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/targets/musl/x86/make.defaults b/profiles/targets/musl/x86/make.defaults new file mode 100644 index 0000000..73fedb0 --- /dev/null +++ b/profiles/targets/musl/x86/make.defaults @@ -0,0 +1,24 @@ +# Copyright 1999-2015 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +ARCH="x86" +ACCEPT_KEYWORDS="${ARCH}" + +CHOST="i686-gentoo-linux-musl" +CFLAGS="-O2 -pipe" +CXXFLAGS="${CFLAGS}" +FFLAGS="${CFLAGS}" +FCFLAGS="${CFLAGS}" + +# Anthony G. Basile <blueness@gentoo.org> (01 Jul 2014) +# Multilib-related setup, bug #515130 +ABI="x86" +DEFAULT_ABI="x86" +MULTILIB_ABIS="x86" +CHOST_x86="${CHOST}" +LIBDIR_x86="lib" +IUSE_IMPLICIT="abi_x86_32" + +# Anthony G. Basile <blueness@gentoo.org> (26 Jan 2013) +# Unhide the CPU_FLAGS_X86 USE_EXPANDs. +USE_EXPAND_HIDDEN="-CPU_FLAGS_X86" diff --git a/profiles/targets/musl/x86/package.use.force b/profiles/targets/musl/x86/package.use.force new file mode 100644 index 0000000..ca264fe --- /dev/null +++ b/profiles/targets/musl/x86/package.use.force @@ -0,0 +1,7 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Michał Górny <mgorny@gentoo.org> (24 Sep 2016) +# Force the host target to avoid dependency hell +sys-devel/clang llvm_targets_X86 +sys-devel/llvm llvm_targets_X86 diff --git a/profiles/targets/musl/x86/parent b/profiles/targets/musl/x86/parent new file mode 100644 index 0000000..f3229c5 --- /dev/null +++ b/profiles/targets/musl/x86/parent @@ -0,0 +1 @@ +.. diff --git a/profiles/targets/musl/x86/use.force b/profiles/targets/musl/x86/use.force new file mode 100644 index 0000000..eb8c5df --- /dev/null +++ b/profiles/targets/musl/x86/use.force @@ -0,0 +1,6 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Force the flag which corresponds to arch/abi, bug #515130 +x86 +abi_x86_32 diff --git a/profiles/targets/musl/x86/use.mask b/profiles/targets/musl/x86/use.mask new file mode 100644 index 0000000..a70efb0 --- /dev/null +++ b/profiles/targets/musl/x86/use.mask @@ -0,0 +1,30 @@ +# Copyright 1999-2017 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License, v2 + +# Force the flag which corresponds to arch/abi, bug #515130 +-x86 +-abi_x86_32 + +# unmask all SIMD assembler flags +-cpu_flags_x86_3dnow +-cpu_flags_x86_3dnowext +-cpu_flags_x86_aes +-cpu_flags_x86_avx +-cpu_flags_x86_avx2 +-cpu_flags_x86_fma3 +-cpu_flags_x86_fma4 +-cpu_flags_x86_mmx +-cpu_flags_x86_mmxext +-cpu_flags_x86_padlock +-cpu_flags_x86_popcnt +-cpu_flags_x86_sse +-cpu_flags_x86_sse2 +-cpu_flags_x86_sse3 +-cpu_flags_x86_sse4_1 +-cpu_flags_x86_sse4_2 +-cpu_flags_x86_sse4a +-cpu_flags_x86_ssse3 +-cpu_flags_x86_xop + +# Masked on all profiles but x86, bug #458354 +-video_cards_geode diff --git a/profiles/targets/systemd/eapi b/profiles/targets/systemd/eapi new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/profiles/targets/systemd/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/systemd/make.defaults b/profiles/targets/systemd/make.defaults index ec97938..8bc0648 100644 --- a/profiles/systemd/make.defaults +++ b/profiles/targets/systemd/make.defaults @@ -1,5 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ USE="systemd udev" + +BOOTSTRAP_USE="${BOOTSTRAP_USE} systemd udev" diff --git a/profiles/targets/systemd/package.mask b/profiles/targets/systemd/package.mask new file mode 100644 index 0000000..0556b1d --- /dev/null +++ b/profiles/targets/systemd/package.mask @@ -0,0 +1,9 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Pacho Ramos <pacho@gentoo.org> (21 Apr 2015) +# This is for running sys-apps/systemd and also helps +# portage to not try to pull in other providers leading to +# strange blockers. +sys-fs/eudev +sys-fs/udev diff --git a/profiles/systemd/package.use.force b/profiles/targets/systemd/package.use.force index 67ffb37..13535a8 100644 --- a/profiles/systemd/package.use.force +++ b/profiles/targets/systemd/package.use.force @@ -1,6 +1,5 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ # Mike Gilbert <floppym@gentoo.org> (22 Apr 2015) # Force systemd to avoid depgraph breakage, bug 547360. diff --git a/profiles/systemd/package.use.mask b/profiles/targets/systemd/package.use.mask index d5850dc..c31a88f 100644 --- a/profiles/systemd/package.use.mask +++ b/profiles/targets/systemd/package.use.mask @@ -1,6 +1,13 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ + +# Rick Farina <zerochaos@gentoo.org> (04 Mar 2017) +# requires libusb[static-libs] which requires libudev[static-libs], all masked +net-wireless/ubertooth static-libs + +# Rick Farina <zerochaos@gentoo.org> (03 Feb 2016) +# dev-libs/libusb[static-libs] requires libudev[static-libs] which is masked below +dev-libs/libusb static-libs # Pacho Ramos <pacho@gentoo.org> (29 May 2014) # upower support is not needed on setups running systemd, also @@ -16,3 +23,7 @@ sys-fs/cryptsetup static static-libs sys-fs/lvm2 static static-libs sys-fs/dmraid static dev-libs/libgudev static-libs +# These are actually possible, but only if you USE=-udev when building pciutils. +# But package.use.mask doesn't have a way to express that, so this profile loses. +sys-apps/flashrom static +sys-apps/pciutils static-libs diff --git a/profiles/targets/systemd/packages.build b/profiles/targets/systemd/packages.build new file mode 100644 index 0000000..6822234 --- /dev/null +++ b/profiles/targets/systemd/packages.build @@ -0,0 +1,6 @@ +# Copyright 1999-2014 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 + +# Nothing pulls in systemd as a dependency for stage1, +# so we need to list it here. +sys-apps/systemd diff --git a/profiles/systemd/use.mask b/profiles/targets/systemd/use.mask index 1a827f8..0bf6287 100644 --- a/profiles/systemd/use.mask +++ b/profiles/targets/systemd/use.mask @@ -1,2 +1,3 @@ # People running systemd must use logind instead, bug #478258 consolekit +-systemd |