summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/catalyst/catalyst-2.0.18-r4.ebuild')
-rw-r--r--dev-util/catalyst/catalyst-2.0.18-r4.ebuild21
1 files changed, 17 insertions, 4 deletions
diff --git a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild b/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
index 45b66c3..08d2610 100644
--- a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
@@ -14,7 +14,7 @@ else
https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
fi
PYTHON_COMPAT=( python2_7 )
@@ -26,7 +26,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
LICENSE="GPL-2"
SLOT="0"
-IUSE="ccache kernel_linux"
+IUSE="ccache kernel_linux kernel_FreeBSD"
DEPEND="
app-text/asciidoc
@@ -35,13 +35,12 @@ DEPEND="
RDEPEND="
app-arch/lbzip2
app-crypt/shash
- app-arch/tar[xattr]
virtual/cdrtools
amd64? ( >=sys-boot/syslinux-3.72 )
ia64? ( sys-fs/dosfstools )
x86? ( >=sys-boot/syslinux-3.72 )
ccache? ( dev-util/ccache )
- kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+ kernel_linux? ( app-arch/tar[xattr] app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
${PYTHON_DEPS}
"
@@ -52,6 +51,9 @@ PATCHES=(
"${FILESDIR}/catalyst-2.0.18-fix-quotes.patch"
"${FILESDIR}/catalyst-2.0.18-remove-machine-id.patch"
"${FILESDIR}/catalyst-2.0.18-stage1-export-ROOT.patch"
+ "${FILESDIR}/catalyst-2.0.18-fbsd-add-tmpfs-support.patch"
+ "${FILESDIR}/catalyst-2.0.18-fbsd-fix-linux32.patch"
+ "${FILESDIR}/catalyst-2.0.18-fbsd-fix-sed.patch"
)
pkg_setup() {
@@ -75,6 +77,17 @@ pkg_setup() {
src_prepare() {
epatch "${PATCHES[@]}"
+
+ if use kernel_FreeBSD ; then
+ # FreeBSD's tar doesn't support the --xattrs and -I lbzip2 options.
+ sed -i 's:--xattrs::g' "${S}"/modules/catalyst_support.py
+ sed -i 's:tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux:tar:g' \
+ "${S}"/modules/generic_stage_target.py
+ for f in modules/catalyst_support.py modules/generic_stage_target.py modules/snapshot_target.py
+ do
+ sed -i 's:-I lbzip2:-j:g' "${S}/${f}"
+ done
+ fi
}
src_install() {