part 2 --yali deps--

This commit is contained in:
Ertuğrul Erata
2015-08-04 13:47:51 +03:00
parent 8e328a7158
commit b7f3e05d5f
26 changed files with 846 additions and 0 deletions
+34
View File
@@ -0,0 +1,34 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import get
WorkDir = "dmraid/1.0.0.rc16-3/dmraid/"
def builddiet():
autotools.make("distclean")
shelltools.export("CC", "diet %s %s %s -Os -static" % (get.CC(), get.CFLAGS(), get.LDFLAGS()))
autotools.configure("--disable-libselinux \
--disable-libsepol")
autotools.make("-j1")
pisitools.insinto("/sbin/", "tools/dmraid", "dmraid.static")
def setup():
autotools.configure("--enable-shared_lib")
def build():
autotools.make("-j1")
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
#builddiet()
pisitools.dodoc("CHANGELOG", "README", "TODO", "KNOWN_BUGS", "doc/*")
@@ -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;
}
/*
@@ -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)
@@ -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);
}
@@ -0,0 +1,11 @@
--- dmraid/lib/misc/file.c~ 2008-06-12 12:54:32.000000000 +0200
+++ dmraid/lib/misc/file.c 2009-03-19 00:14:33.000000000 +0100
@@ -69,7 +69,7 @@
if ((fd = open(path, flags, lc->mode)) == -1)
LOG_ERR(lc, 0, "opening \"%s\"", path);
-#ifdef __KLIBC__
+#if defined(__KLIBC__) || defined(__dietlibc__)
#define DMRAID_LSEEK lseek
#else
#define DMRAID_LSEEK lseek64
+85
View File
@@ -0,0 +1,85 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>dmraid</Name>
<Homepage>http://people.redhat.com/~heinzm/sw/dmraid</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>GPLv2</License>
<IsA>app:console</IsA>
<Summary>Device-Mapper Software RAID support tool and library</Summary>
<Description>Device-Mapper Software RAID support tool and library</Description>
<Archive sha1sum="162b6173b91a0121a52402d2ed939b43d74ff605" type="tarbz2">http://launchpad.net/dmraid/1.0/1.0.0.rc16-3/+download/dmraid-1.0.0.rc16-3.tar.bz2</Archive>
<BuildDependencies>
<Dependency>device-mapper-event-devel</Dependency>
<Dependency>device-mapper-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">dmraid-diet.patch</Patch>
<Patch level="2">dmraid-1.0.0_rc16-return-all-sets.patch</Patch>
<Patch level="0">dmraid-1.0.0_rc16-static-build-fixes.patch</Patch>
<Patch level="2">dmraid-1.0.0_rc16-undo-p-rename.patch</Patch>
</Patches>
</Source>
<Package>
<Name>dmraid</Name>
<RuntimeDependencies>
<Dependency>device-mapper</Dependency>
<Dependency>device-mapper-event</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/sbin</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="man">/usr/share/man</Path>
</Files>
</Package>
<Package>
<Name>dmraid-devel</Name>
<Summary>Development files for dmraid</Summary>
<RuntimeDependencies>
<Dependency release="current">dmraid</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
</Files>
</Package>
<!--
<Package>
<Name>dmraid-static</Name>
<PartOf>system.static</PartOf>
<Files>
<Path fileType="executable">/sbin</Path>
</Files>
</Package>
-->
<History>
<Update release="3">
<Date>2014-02-17</Date>
<Version>1.0.0_rc16</Version>
<Comment>Release.</Comment>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2013-03-15</Date>
<Version>1.0.0_rc16</Version>
<Comment>V.Bump</Comment>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2010-10-13</Date>
<Version>1.0.0_rc15</Version>
<Comment>First release</Comment>
<Name>Pisi Linux Admins</Name>
<Email>admins@pisilinux.org</Email>
</Update>
</History>
</PISI>
+13
View File
@@ -0,0 +1,13 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>dmraid</Name>
<Summary xml:lang="tr">ATARAID aygıtlarını (Yazılımsal RAID) denetleme aracı</Summary>
<Description xml:lang="tr">ATARAID aygıtları yaratmak, yönetmek ve izlemek için kullanılan bir araçtır.</Description>
</Source>
<Package>
<Name>dmraid-devel</Name>
<Summary xml:lang="tr">dmraid için geliştirme dosyaları</Summary>
</Package>
</PISI>