aufs-util for docker utility

This commit is contained in:
Ertuğrul Erata
2016-07-23 23:00:43 +03:00
parent 5e30f2ff7e
commit 8644bdfd7c
5 changed files with 173 additions and 1 deletions
+20
View File
@@ -0,0 +1,20 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Copyright 2016 TUBITAK/UEKAE
# Licensed under the GNU General Public License, version 2.
# See the file http://www.gnu.org/copyleft/gpl.txt.
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import get
def build():
autotools.make()
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.domove("libau.*","/usr/lib")
@@ -0,0 +1,53 @@
--- aufs-util-4.0_p20151116.orig/Makefile 2015-11-12 05:29:36.000000000 +0200
+++ aufs-util-4.0_p20151116/Makefile 2016-06-18 02:13:42.598522963 +0300
@@ -19,7 +19,7 @@
override CPPFLAGS += -D_GNU_SOURCE
override CPPFLAGS += -I./libau
override CPPFLAGS += -DAUFHSM_CMD=\"/usr/bin/aufhsm\"
-override CFLAGS += -O -Wall
+override CFLAGS += -Wall
INSTALL ?= install
Install = ${INSTALL} -o root -g root -p
ManDir = /usr/share/man
@@ -76,7 +76,6 @@
ver_test: ver
./ver
-${Bin}: override LDFLAGS += -static -s
${Bin}: LDLIBS = -L. -lautil
${BinObj}: %.o: %.c ${LibUtilHdr} ${LibUtil}
--- aufs-util-4.0_p20151116.orig/fhsm/Makefile 2015-11-12 05:29:36.000000000 +0200
+++ aufs-util-4.0_p20151116/fhsm/Makefile 2016-06-18 02:13:42.601856468 +0300
@@ -42,9 +42,9 @@
.NOTPARALLEL: ${LibFhsm}
${TgtObj}: %.o: %.c ${LibFhsmHdr} $(addprefix ../, ${LibUtilHdr}) ${LibFhsm}
-#${Tgt}: override LDFLAGS += -static
-${Tgt}: override LDFLAGS += -s
-${Tgt}: override LDLIBS += -L. -lfhsm -L.. -lautil -lrt
+#${Tgt}: override LDFLAGS +=
+${Tgt}: override LDFLAGS +=
+${Tgt}: override LDLIBS += -L. -lfhsm -L.. -lautil -lrt
########################################
--- aufs-util-4.0_p20151116.orig/libau/Makefile 2015-11-12 05:29:36.000000000 +0200
+++ aufs-util-4.0_p20151116/libau/Makefile 2016-06-18 02:13:42.601856468 +0300
@@ -37,14 +37,14 @@
ln -sf $< $@
${LibSo}.${LibSoMajor}: ${LibSo}.${LibSoMajor}.${LibSoMinor}
ln -sf $< $@
-${LibSo}.${LibSoMajor}.${LibSoMinor}: override LDFLAGS += -s
+${LibSo}.${LibSoMajor}.${LibSoMinor}: override LDFLAGS +=
${LibSo}.${LibSoMajor}.${LibSoMinor}: override LDLIBS += -ldl -lpthread
${LibSo}.${LibSoMajor}.${LibSoMinor}: ${LibSoObj}
${CC} --shared -Wl,-soname,${LibSo}.${LibSoMajor} ${LDFLAGS} \
-o $@ $^ ${LDLIBS}
install_ulib: File = ${LibSo}.${LibSoMajor}.${LibSoMinor}
-install_ulib: Tgt = ${DESTDIR}/usr/lib
+install_ulib: Tgt = ${DESTDIR}$(LIBDIR)
install_ulib: ${File}
${INSTALL} -d ${Tgt}
${Install} -m 644 ${File} ${Tgt}
@@ -0,0 +1,56 @@
diff -Nuar aufs-util.orig/fhsm/Makefile aufs-util/fhsm/Makefile
--- aufs-util.orig/fhsm/Makefile 2016-07-23 21:55:47.853968465 +0300
+++ aufs-util/fhsm/Makefile 2016-07-23 22:46:11.418882478 +0300
@@ -42,9 +42,9 @@
.NOTPARALLEL: ${LibFhsm}
${TgtObj}: %.o: %.c ${LibFhsmHdr} $(addprefix ../, ${LibUtilHdr}) ${LibFhsm}
-#${Tgt}: override LDFLAGS += -static
-${Tgt}: override LDFLAGS += -s
-${Tgt}: override LDLIBS += -L. -lfhsm -L.. -lautil -lrt
+#${Tgt}: override LDFLAGS +=tatic
+${Tgt}: override LDFLAGS +=
+${Tgt}: override LDLIBS += -L. -lfhsm -L.. -lautil -lrt
########################################
diff -Nuar aufs-util.orig/libau/Makefile aufs-util/libau/Makefile
--- aufs-util.orig/libau/Makefile 2016-07-23 21:55:47.854968465 +0300
+++ aufs-util/libau/Makefile 2016-07-23 22:45:59.081882829 +0300
@@ -37,14 +37,14 @@
ln -sf $< $@
${LibSo}.${LibSoMajor}: ${LibSo}.${LibSoMajor}.${LibSoMinor}
ln -sf $< $@
-${LibSo}.${LibSoMajor}.${LibSoMinor}: override LDFLAGS += -s
+${LibSo}.${LibSoMajor}.${LibSoMinor}: override LDFLAGS +=
${LibSo}.${LibSoMajor}.${LibSoMinor}: override LDLIBS += -ldl -lpthread
${LibSo}.${LibSoMajor}.${LibSoMinor}: ${LibSoObj}
${CC} --shared -Wl,-soname,${LibSo}.${LibSoMajor} ${LDFLAGS} \
-o $@ $^ ${LDLIBS}
install_ulib: File = ${LibSo}.${LibSoMajor}.${LibSoMinor}
-install_ulib: Tgt = ${DESTDIR}/usr/lib
+install_ulib: Tgt = ${DESTDIR}/usr/
install_ulib: ${File}
${INSTALL} -d ${Tgt}
${Install} -m 644 ${File} ${Tgt}
diff -Nuar aufs-util.orig/Makefile aufs-util/Makefile
--- aufs-util.orig/Makefile 2016-07-23 21:55:47.852968465 +0300
+++ aufs-util/Makefile 2016-07-23 22:45:33.723883550 +0300
@@ -19,7 +19,7 @@
override CPPFLAGS += -D_GNU_SOURCE
override CPPFLAGS += -I./libau
override CPPFLAGS += -DAUFHSM_CMD=\"/usr/bin/aufhsm\"
-override CFLAGS += -O -Wall
+override CFLAGS += -Wall
INSTALL ?= install
Install = ${INSTALL} -o root -g root -p
ManDir = /usr/share/man
@@ -76,7 +76,6 @@
ver_test: ver
./ver
-${Bin}: override LDFLAGS += -static -s
${Bin}: LDLIBS = -L. -lautil
${BinObj}: %.o: %.c ${LibUtilHdr} ${LibUtil}
+43
View File
@@ -0,0 +1,43 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pardus.org.tr/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>aufs-util</Name>
<Homepage>http://aufs.sourceforge.ne</Homepage>
<Packager>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Packager>
<License>GPLv2</License>
<IsA>app:gui</IsA>
<Summary>Utilities are always necessary for aufs</Summary>
<Description>Utilities are always necessary for aufs</Description>
<Archive sha1sum="5a2db9e6fcd362a6622ba81426226c190fb8a50e" type="targz">https://sourceforge.net/projects/pisilinux/files/source/aufs-util-20160717.tar.gz</Archive>
<Patches>
<Patch level="1">buildflags.patch</Patch>
</Patches>
</Source>
<Package>
<Name>aufs-util</Name>
<RuntimeDependencies>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc</Path>
<Path fileType="executable">/sbin</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="man">/usr/share/man</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2016-07-23</Date>
<Version>20160717</Version>
<Comment>First release</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
</History>
</PISI>
+1 -1
View File
@@ -31,7 +31,7 @@
<Name>docker</Name>
<RuntimeDependencies>
<Dependency>git</Dependency>
<!--Dependency versionFrom="1.4.3">golang</Dependency-->
<Dependency>aufs-util</Dependency>
<Dependency>sqlite</Dependency>
<Dependency>device-mapper</Dependency>
<Dependency>btrfs-progs</Dependency>