From 8644bdfd7c99e9495d6bf15937a66fff029ec57e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Sat, 23 Jul 2016 23:00:43 +0300 Subject: [PATCH] aufs-util for docker utility --- hardware/disk/aufs-util/actions.py | 20 +++++++ .../disk/aufs-util/files/buildflags.patch | 53 ++++++++++++++++++ .../disk/aufs-util/files/library_path.patch | 56 +++++++++++++++++++ hardware/disk/aufs-util/pspec.xml | 43 ++++++++++++++ hardware/virtualization/docker/pspec.xml | 2 +- 5 files changed, 173 insertions(+), 1 deletion(-) create mode 100644 hardware/disk/aufs-util/actions.py create mode 100644 hardware/disk/aufs-util/files/buildflags.patch create mode 100644 hardware/disk/aufs-util/files/library_path.patch create mode 100644 hardware/disk/aufs-util/pspec.xml diff --git a/hardware/disk/aufs-util/actions.py b/hardware/disk/aufs-util/actions.py new file mode 100644 index 0000000000..1d671ada19 --- /dev/null +++ b/hardware/disk/aufs-util/actions.py @@ -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") + diff --git a/hardware/disk/aufs-util/files/buildflags.patch b/hardware/disk/aufs-util/files/buildflags.patch new file mode 100644 index 0000000000..e893f445aa --- /dev/null +++ b/hardware/disk/aufs-util/files/buildflags.patch @@ -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} diff --git a/hardware/disk/aufs-util/files/library_path.patch b/hardware/disk/aufs-util/files/library_path.patch new file mode 100644 index 0000000000..91bafc741d --- /dev/null +++ b/hardware/disk/aufs-util/files/library_path.patch @@ -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} + diff --git a/hardware/disk/aufs-util/pspec.xml b/hardware/disk/aufs-util/pspec.xml new file mode 100644 index 0000000000..b47a3299ee --- /dev/null +++ b/hardware/disk/aufs-util/pspec.xml @@ -0,0 +1,43 @@ + + + + + aufs-util + http://aufs.sourceforge.ne + + Ertuğrul Erata + ertugrulerata@gmail.com + + GPLv2 + app:gui + Utilities are always necessary for aufs + Utilities are always necessary for aufs + https://sourceforge.net/projects/pisilinux/files/source/aufs-util-20160717.tar.gz + + buildflags.patch + + + + + aufs-util + + + + /etc + /sbin + /usr/bin + /usr/lib + /usr/share/man + + + + + + 2016-07-23 + 20160717 + First release + Ertuğrul Erata + ertugrulerata@gmail.com + + + diff --git a/hardware/virtualization/docker/pspec.xml b/hardware/virtualization/docker/pspec.xml index 3bf1c3be56..6ac0bd0e1c 100644 --- a/hardware/virtualization/docker/pspec.xml +++ b/hardware/virtualization/docker/pspec.xml @@ -31,7 +31,7 @@ docker git - + aufs-util sqlite device-mapper btrfs-progs