diff options
Diffstat (limited to 'sys-fs/dmraid')
-rw-r--r-- | sys-fs/dmraid/Manifest | 9 | ||||
-rw-r--r-- | sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild | 100 | ||||
-rw-r--r-- | sys-fs/dmraid/files/dmraid-1.0.0_rc16-parallel-make.patch | 11 | ||||
-rw-r--r-- | sys-fs/dmraid/files/dmraid-1.0.0_rc16-return-all-sets.patch | 11 | ||||
-rw-r--r-- | sys-fs/dmraid/files/dmraid-1.0.0_rc16-static-build-fixes.patch | 110 | ||||
-rw-r--r-- | sys-fs/dmraid/files/dmraid-1.0.0_rc16-undo-p-rename.patch | 13 | ||||
-rw-r--r-- | sys-fs/dmraid/metadata.xml | 16 |
7 files changed, 270 insertions, 0 deletions
diff --git a/sys-fs/dmraid/Manifest b/sys-fs/dmraid/Manifest new file mode 100644 index 000000000000..460c6bfbe0dc --- /dev/null +++ b/sys-fs/dmraid/Manifest @@ -0,0 +1,9 @@ +AUX dmraid-1.0.0_rc16-parallel-make.patch 594 SHA256 f8a3d665822fa652d839af70fcef800d59c296891144a42603a473d6d9a69fc4 SHA512 deb57258ab2aacd8e9b17e8430ba6f7453930280ac2990fe33e5f6cf0ef572591c30385ec3f0a23b335ae004c87b09d5fb2f1fe821f67acd79fde7e0a4d32c7c WHIRLPOOL d7f32dd53f6527c354a7dfa4ec95966819d3e4414c63978a5b3534da8581b86cdac3ca71021ba7ef19141cc38569c281be52882b054c3131439c24e156145d0d +AUX dmraid-1.0.0_rc16-return-all-sets.patch 283 SHA256 a45054960405e41ec81bfe113adbf273d5c3292897233d58500ea12305c3c7cc SHA512 28da140287f7ed8625fc6a7131948b76898df8fbbdce9be278852ddc8f466a8e6352c7d4e1e96aa51a3737895e12c0607501bc657a43f1ab54d879d5510c310e WHIRLPOOL 061bf2a9d789c0a0e0385b28345889c380ba3d824351639a9c2c84ab193956f62e61d4c04116a9128783d653118f7598a65071109b9779749a295a5226e3c0ea +AUX dmraid-1.0.0_rc16-static-build-fixes.patch 3840 SHA256 ba062ea97d9193f3bf567e031077393890349f01dad3c5864556e82d4d44f767 SHA512 ff2aaebec2be1ace40377a4bcd91c802c190ac4047643478d6f99e3023cf69b4a5e8230519ce2f3febe5d6419a54557184739bcbeaa08047354ca93f27e4ec67 WHIRLPOOL ef57ad27eb7919d66ac46353b19a00405a0937505f960d7952b65d90137b0ae0d8ea12d13df4461c8e737bae620e736b5d0c2bf41a91fe3eb35850d2a804ca89 +AUX dmraid-1.0.0_rc16-undo-p-rename.patch 531 SHA256 5eb8d6b268249fe3ef9e184376dfc04a2b8cffb4204c41d69480f3ae09caa670 SHA512 b5b93d49e716c585284dfd89fe4651fd5bb6921196a053797aeec9cf5654f11da7b2ed1ad93f2df15fd3ef47c95efd67aeecc196fcfd3feb22f7903ad103a8c6 WHIRLPOOL 0343c2619499c43478438081c751c2e23133d39a45ef12e2fb6664babf6e4d1e385f07714cc487603e8b0962f2a0314bb56bc0df81c179e51d7013df94222102 +DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 SHA256 93421bd169d71ff5e7d2db95b62b030bfa205a12010b6468dcdef80337d6fbd8 SHA512 7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e WHIRLPOOL 87915ea0013766da8a9722b437bfe146b4b2c7560a7814ac6caab92054ddc3b4b59ceb4d413609d5eaab92b5cee67886ade7924455f1dba19f1b8dabc25d3498 +EBUILD dmraid-1.0.0_rc16-r3.ebuild 3267 SHA256 e732f3dc82c073e11d4649e5dba8af889b48817a9af9543240f05a674d03b703 SHA512 eca54618444b7e4afa2e69dcb134adcaaaa9a370d43623cc008b6b03e11683839aed8ad2335f60c70b69094e91bdc4eca9f346962d11102ac607c97e06906172 WHIRLPOOL b1eee57323acea7652f7d16aa48a41ea70c39b2c9afa44556a584f0e9617f44c5c8aa1f6e04828358d6b038e3bdc4368f533b37c867995bb51c10bac1d8a71ee +MISC ChangeLog 3638 SHA256 f646d10f1cfeb805b0413d0b4ac04dfb9a6a31bc9bebf2b8d03502c300b83d92 SHA512 9a83079a5759336c89b176655f6fe16da8f6a553f3378d858bfb56e7b0ab0b59692e9675bfb01a47996d3516b5b6a46e127abc8b48260fd79e76ba0497a93e45 WHIRLPOOL ca4a7971889f3f40bc3993962188a528ac12ef33a10846bc2acdae18a79771991b270917cd29bccdd101f68f2c035e8c62b9d9f53c5fbf925ed216a56927dcca +MISC ChangeLog-2015 7648 SHA256 497c4f60643e4d5c0598388fcb2d086856f9f58871ffcd4063481d93dca01a54 SHA512 9e8fb9a886cd12645687b8c87ea7800c7ad2b52e9f4dc825bfd33dfe98056fd152dd79480edb1d7402b23cef3490851b0d882e5e43202647511d8130f68296ab WHIRLPOOL 66c6e8c4b98f4bf66d32b8f52f8ff008f24610f77db680be97a88430df109e3f278941aed48d3ce3a2c4267af949f6f8def2055054465fea7b2e9e6344a8b49f +MISC metadata.xml 769 SHA256 c5aecb2733e924a3dbcfbc723293b83f385a194104099dbacde155e3de2eb593 SHA512 e716dad80405dae942af5ded092214854432f43a5c622e8ce41f36af3f514c9425de401da278e2b0a2abc96103e4894896ff539f5665e5c48ec2640e57d11e26 WHIRLPOOL d99b191a2565a197d3a477f48fa80aea42ae848e236b6f3d3c63059f18e88378da9a61a6770573227cecf894a677b6d972e1b8cb0af286fec542d35cc4a84953 diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild new file mode 100644 index 000000000000..8c99b3b48310 --- /dev/null +++ b/sys-fs/dmraid/dmraid-1.0.0_rc16-r3.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit autotools linux-info flag-o-matic eutils + +MY_PV=${PV/_/.}-3 + +DESCRIPTION="Device-mapper RAID tool and library" +HOMEPAGE="https://people.redhat.com/~heinzm/sw/dmraid/" +SRC_URI="https://people.redhat.com/~heinzm/sw/dmraid/src/${PN}-${MY_PV}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86" +IUSE="dietlibc intel_led klibc led mini static" +REQUIRED_USE="klibc? ( !dietlibc )" + +RDEPEND=">=sys-fs/lvm2-2.02.45 + klibc? ( dev-libs/klibc ) + dietlibc? ( dev-libs/dietlibc )" +DEPEND="${RDEPEND} + virtual/pkgconfig + static? ( sys-fs/lvm2[static-libs] )" + +S=${WORKDIR}/${PN}/${MY_PV}/${PN} + +pkg_setup() { + if kernel_is lt 2 6 ; then + ewarn "You are using a kernel < 2.6" + ewarn "DMraid uses recently introduced Device-Mapper features." + ewarn "These might be unavailable in the kernel you are running now." + fi +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-undo-p-rename.patch \ + "${FILESDIR}"/${P}-return-all-sets.patch \ + "${FILESDIR}"/${P}-static-build-fixes.patch \ + "${FILESDIR}"/${P}-parallel-make.patch + # pkg_check_modules is not in aclocal.m4 by default, and eautoreconf doesnt add it + einfo "Appending pkg.m4 from system to aclocal.m4" + cat "${ROOT}"/usr/share/aclocal/pkg.m4 >>"${S}"/aclocal.m4 || die "Could not append pkg.m4" + epatch_user + eautoreconf + + einfo "Creating prepatched source archive for use with Genkernel" + # archive the patched source for use with genkernel + cd "${WORKDIR}" || die + mkdir -p "tmp/${PN}" || die + cp -a "${PN}/${MY_PV}/${PN}" "tmp/${PN}" || die + mv "tmp/${PN}/${PN}" "tmp/${PN}/${MY_PV}" || die + cd tmp || die + tar -jcf ${PN}-${MY_PV}-prepatched.tar.bz2 ${PN} || die + mv ${PN}-${MY_PV}-prepatched.tar.bz2 .. || die +} + +src_configure() { + econf --with-usrlibdir='${prefix}'/$(get_libdir) \ + $(use_enable static static_link) \ + $(use_enable mini) \ + $(use_enable led) \ + $(use_enable intel_led) \ + $(use_enable klibc) \ + $(use_enable dietlibc) +} + +src_install() { + emake DESTDIR="${D}" install + dodoc CHANGELOG README TODO KNOWN_BUGS doc/* + insinto /usr/share/${PN} + doins "${WORKDIR}"/${PN}-${MY_PV}-prepatched.tar.bz2 +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "For booting Gentoo from Device-Mapper RAID you can use a Genkernel initramfs." + elog + elog "Genkernel will generate the kernel and the initramfs with a statically " + elog "linked dmraid binary (its own version which may not be the same as this version):" + elog "\t emerge -av sys-kernel/genkernel" + elog "\t genkernel --dmraid all" + fi + # skip this message if this revision has already been emerged + if [[ " ${REPLACING_VERSIONS} " != *\ ${PVR}\ * ]]; then + elog + elog "A pre-patched distfile of this version of DMRAID has been installed at" + elog "/usr/share/${PN}/${PN}-${MY_PV}-prepatched.tar.bz2 , to support using it within a" + elog "Genkernel initramfs." + elog + fi + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "If you would rather use this version of DMRAID with Genkernel, update the following" + elog "in /etc/genkernel.conf:" + elog "\t DMRAID_VER=\"${MY_PV}\"" + elog "\t DMRAID_SRCTAR=\"/usr/share/${PN}/${PN}-${MY_PV}-prepatched.tar.bz2\"" + elog + fi +} diff --git a/sys-fs/dmraid/files/dmraid-1.0.0_rc16-parallel-make.patch b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-parallel-make.patch new file mode 100644 index 000000000000..8c89374588fb --- /dev/null +++ b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-parallel-make.patch @@ -0,0 +1,11 @@ +--- dmraid/1.0.0.rc16-3/dmraid/lib/Makefile.in.orig 2016-09-20 12:54:09.416628404 +0200 ++++ dmraid/1.0.0.rc16-3/dmraid/lib/Makefile.in 2016-09-20 12:55:06.343698229 +0200 +@@ -79,7 +79,7 @@ + -Wl,-soname,$(notdir $@).$(DMRAID_LIB_MAJOR) \ + $(DEVMAPPEREVENT_LIBS) $(DEVMAPPER_LIBS) $(DL_LIBS) $(LIBS) + +-$(LIB_EVENTS_SHARED): $(OBJECTS2) ++$(LIB_EVENTS_SHARED): $(OBJECTS2) $(LIB_SHARED) + $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJECTS2) \ + -shared -Wl,--discard-all -Wl,--no-undefined -Wl,-soname,$(notdir $@) \ + $(LIB_SHARED) $(DEVMAPPEREVENT_LIBS) $(DEVMAPPER_LIBS) $(PTHREAD_LIBS) $(LIBS) diff --git a/sys-fs/dmraid/files/dmraid-1.0.0_rc16-return-all-sets.patch b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-return-all-sets.patch new file mode 100644 index 000000000000..1e6c71322498 --- /dev/null +++ b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-return-all-sets.patch @@ -0,0 +1,11 @@ +--- a/1.0.0.rc16/lib/metadata/metadata.c 2009-11-27 21:57:50.182129589 -0800 ++++ b/1.0.0.rc16/lib/metadata/metadata.c 2009-11-27 21:57:58.950964293 -0800 +@@ -839,7 +839,7 @@ + */ + if (T_GROUP(rs)) { + _discover_partitions(lc, &rs->sets); +- return; ++ continue; + } + + /* diff --git a/sys-fs/dmraid/files/dmraid-1.0.0_rc16-static-build-fixes.patch b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-static-build-fixes.patch new file mode 100644 index 000000000000..298811701e4e --- /dev/null +++ b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-static-build-fixes.patch @@ -0,0 +1,110 @@ +--- tools/Makefile.in.old 2010-05-31 07:18:31.000000000 -0400 ++++ tools/Makefile.in 2010-12-13 13:15:22.000000000 -0500 +@@ -60,17 +60,23 @@ + ifeq ("@KLIBC@", "no") + ifeq ("@STATIC_LINK@", "no") + LDFLAGS += -rdynamic ++ MYLIBOBJ=$(top_builddir)/lib/libdmraid.so + else + LDFLAGS += -static ++ MYLIBOBJ=$(top_builddir)/lib/libdmraid.a ++ DMRAIDLIBS += \ ++ $(DEVMAPPEREVENT_LIBS) \ ++ $(DEVMAPPER_LIBS) \ ++ $(DL_LIBS) + endif + endif + + .PHONY: install_dmraid_tools + +-dmraid: $(OBJECTS) $(top_builddir)/lib/libdmraid.a ++dmraid: $(OBJECTS) $(MYLIBOBJ) + $(CC) -o $@ $(OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(DMRAIDLIBS) $(LIBS) + +-dmevent_tool: $(OBJECTS2) $(top_builddir)/lib/libdmraid.a ++dmevent_tool: $(OBJECTS2) $(MYLIBOBJ) + $(CC) -o $@ $(OBJECTS2) $(INCLUDES) $(LDFLAGS) -L$(top_builddir)/lib \ + $(DMEVENTTOOLLIBS) $(DMRAIDLIBS) $(LIBS) + +--- lib/Makefile.in.old 2010-10-27 07:31:46.000000000 -0400 ++++ lib/Makefile.in 2010-12-13 13:04:16.000000000 -0500 +@@ -60,11 +60,11 @@ + USRLIB_RELPATH = $(shell echo $(abspath $(usrlibdir) $(libdir)) | \ + $(AWK) -f $(top_srcdir)/tools/relpath.awk) + +-TARGETS = $(LIB_STATIC) ++TARGETS = $(LIB_STATIC) $(LIB_SHARED) $(LIB_EVENTS_SHARED) + + ifeq ("@KLIBC@", "no") + ifeq ("@STATIC_LINK@", "no") +- TARGETS += $(LIB_SHARED) $(LIB_EVENTS_SHARED) ++ TARGETS = $(LIB_SHARED) $(LIB_EVENTS_SHARED) + endif + endif + +--- configure.in 2010-05-31 07:18:30.000000000 -0400 ++++ configure.in.new 2010-12-07 13:30:40.000000000 -0500 +@@ -155,6 +155,15 @@ + Default is dynamic linking]), + [STATIC_LINK=$enableval], [STATIC_LINK=no]) + ++if test "x$STATIC_LINK" != "xno"; then ++ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then ++ AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) ++ fi ++ PKG_CONFIG="${PKG_CONFIG} --static" ++ ac_cv_env_PKG_CONFIG_set=set ++fi ++PKG_PROG_PKG_CONFIG([0.2]) ++ + dnl Enables shared libdmraid + AC_ARG_ENABLE(shared_lib, + AC_HELP_STRING([--enable-shared_lib], [Use this to generate shared +@@ -248,23 +257,31 @@ + AC_HELP_STRING([--with-devmapper-prefix=PFX], + [Where is devmapper library installed]), + [DEVMAPPER_LIBS="-L$withval/lib" +- DEVMAPPER_CFLAGS="-I$withval/include"], ++ DEVMAPPER_CFLAGS="-I$withval/include" ++ dmprefix=$withval], + [DEVMAPPER_LIBS= +- DEVMAPPER_CFLAGS=]) +-save_LDFLAGS=$LDFLAGS +-save_CPPFLAGS=$CPPFLAGS +-LDFLAGS="$LDFLAGS $DEVMAPPER_LIBS" +-CPPFLAGS="$CPPFLAGS $DEVMAPPER_CFLAGS" +-AC_CHECK_LIB(devmapper-event, dm_event_handler_create, +- [DEVMAPPEREVENT_LIBS="$DEVMAPPER_LIBS -ldevmapper-event"], +- [AC_MSG_ERROR([device-mapper-event library is either missing or is too old and badly linked])]) +-AC_CHECK_LIB(devmapper, dm_task_set_name, +- [DEVMAPPER_LIBS="$DEVMAPPER_LIBS -ldevmapper"], +- [AC_MSG_ERROR([device-mapper library is missing])]) +-AC_CHECK_HEADERS(libdevmapper.h libdevmapper-event.h,, +- [AC_MSG_ERROR([Missing headers device-mapper headers])]) +-CPPFLAGS=$save_CPPFLAGS +-LDFLAGS=$save_LDFLAGS ++ DEVMAPPER_CFLAGS= ++ dmprefix=no]) ++if test "x$dmprefix" = xno ; then ++ PKG_CHECK_MODULES([DEVMAPPER],[devmapper], ++ [PKG_CHECK_MODULES([DEVMAPPEREVENT],[devmapper-event]) ++ ]) ++else ++ save_LDFLAGS=$LDFLAGS ++ save_CPPFLAGS=$CPPFLAGS ++ LDFLAGS="$LDFLAGS $DEVMAPPER_LIBS" ++ CPPFLAGS="$CPPFLAGS $DEVMAPPER_CFLAGS" ++ AC_CHECK_LIB(devmapper-event, dm_event_handler_create, ++ [DEVMAPPEREVENT_LIBS="$DEVMAPPER_LIBS -ldevmapper-event"], ++ [AC_MSG_ERROR([device-mapper-event library is either missing or is too old and badly linked])]) ++ AC_CHECK_LIB(devmapper, dm_task_set_name, ++ [DEVMAPPER_LIBS="$DEVMAPPER_LIBS -ldevmapper"], ++ [AC_MSG_ERROR([device-mapper library is missing])]) ++ AC_CHECK_HEADERS(libdevmapper.h libdevmapper-event.h,, ++ [AC_MSG_ERROR([Missing headers device-mapper headers])]) ++ CPPFLAGS=$save_CPPFLAGS ++ LDFLAGS=$save_LDFLAGS ++fi + + VERSION=$srcdir/tools/VERSION + DMRAID_LIB_MAJOR=$(cut -d. -f1 $VERSION)
\ No newline at end of file diff --git a/sys-fs/dmraid/files/dmraid-1.0.0_rc16-undo-p-rename.patch b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-undo-p-rename.patch new file mode 100644 index 000000000000..6636b0563086 --- /dev/null +++ b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-undo-p-rename.patch @@ -0,0 +1,13 @@ +Author: Giuseppe Iuculano <giuseppe@iuculano.it> +Description: Removed "p" from device name. A proper upgrade script is needed before using it. +--- a/1.0.0.rc15/lib/format/partition/dos.c ++++ b/1.0.0.rc15/lib/format/partition/dos.c +@@ -31,7 +31,7 @@ _name(struct lib_context *lc, struct rai + { + const char *base = get_basename(lc, rd->di->path); + +- return type ? snprintf(str, len, "%s%s%u", base, OPT_STR_PARTCHAR(lc), ++ return type ? snprintf(str, len, "%s%u", base, + partition) : snprintf(str, len, "%s", base); + } + diff --git a/sys-fs/dmraid/metadata.xml b/sys-fs/dmraid/metadata.xml new file mode 100644 index 000000000000..631bce7f7303 --- /dev/null +++ b/sys-fs/dmraid/metadata.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <use> + <flag name="dietlibc">Compile against <pkg>dev-libs/dietlibc</pkg></flag> + <flag name="intel_led">Enable Intel LED support</flag> + <flag name="klibc">Compile against <pkg>dev-libs/klibc</pkg></flag> + <flag name="led">Enable LED support</flag> + <flag name="mini">Create a minimal binary suitable for early boot environments</flag> + </use> + <maintainer type="person"> + <email>axs@gentoo.org</email> + <name>Ian Stakenvicius</name> + </maintainer> + <longdescription>This software discovers, activates, deactivates and displays properties of software RAID sets eg: ATARAID and contained DOS partitions.</longdescription> +</pkgmetadata> |