diff options
Diffstat (limited to 'src/grp-import')
| -rw-r--r-- | src/grp-import/Makefile | 103 | ||||
| -rw-r--r-- | src/grp-import/systemd-export/Makefile | 51 | ||||
| -rw-r--r-- | src/grp-import/systemd-export/export-raw.c (renamed from src/grp-import/export-raw.c) | 0 | ||||
| -rw-r--r-- | src/grp-import/systemd-export/export-raw.h (renamed from src/grp-import/export-raw.h) | 0 | ||||
| -rw-r--r-- | src/grp-import/systemd-export/export-tar.c (renamed from src/grp-import/export-tar.c) | 0 | ||||
| -rw-r--r-- | src/grp-import/systemd-export/export-tar.h (renamed from src/grp-import/export-tar.h) | 0 | ||||
| -rw-r--r-- | src/grp-import/systemd-export/export.c (renamed from src/grp-import/export.c) | 0 | ||||
| -rw-r--r-- | src/grp-import/systemd-import/Makefile | 52 | ||||
| -rw-r--r-- | src/grp-import/systemd-import/import-common.c (renamed from src/grp-import/import-common.c) | 0 | ||||
| -rw-r--r-- | src/grp-import/systemd-import/import-common.h (renamed from src/grp-import/import-common.h) | 0 | ||||
| -rw-r--r-- | src/grp-import/systemd-import/import-compress.c (renamed from src/grp-import/import-compress.c) | 0 | ||||
| -rw-r--r-- | src/grp-import/systemd-import/import-compress.h (renamed from src/grp-import/import-compress.h) | 0 | ||||
| -rw-r--r-- | src/grp-import/systemd-import/import-pubring.gpg (renamed from src/grp-import/import-pubring.gpg) | bin | 9551 -> 9551 bytes | |||
| -rw-r--r-- | src/grp-import/systemd-import/import-raw.c (renamed from src/grp-import/import-raw.c) | 0 | ||||
| -rw-r--r-- | src/grp-import/systemd-import/import-raw.h (renamed from src/grp-import/import-raw.h) | 0 | ||||
| -rw-r--r-- | src/grp-import/systemd-import/import-tar.c (renamed from src/grp-import/import-tar.c) | 0 | ||||
| -rw-r--r-- | src/grp-import/systemd-import/import-tar.h (renamed from src/grp-import/import-tar.h) | 0 | ||||
| -rw-r--r-- | src/grp-import/systemd-import/import.c (renamed from src/grp-import/import.c) | 0 | ||||
| -rw-r--r-- | src/grp-import/systemd-importd/Makefile | 39 | ||||
| -rw-r--r-- | src/grp-import/systemd-importd/importd.c (renamed from src/grp-import/importd.c) | 0 | ||||
| -rw-r--r-- | src/grp-import/systemd-pull/Makefile | 64 | ||||
| -rw-r--r-- | src/grp-import/systemd-pull/pull-common.c (renamed from src/grp-import/pull-common.c) | 0 | ||||
| -rw-r--r-- | src/grp-import/systemd-pull/pull-common.h (renamed from src/grp-import/pull-common.h) | 0 | ||||
| -rw-r--r-- | src/grp-import/systemd-pull/pull-job.c (renamed from src/grp-import/pull-job.c) | 0 | ||||
| -rw-r--r-- | src/grp-import/systemd-pull/pull-job.h (renamed from src/grp-import/pull-job.h) | 0 | ||||
| -rw-r--r-- | src/grp-import/systemd-pull/pull-raw.c (renamed from src/grp-import/pull-raw.c) | 0 | ||||
| -rw-r--r-- | src/grp-import/systemd-pull/pull-raw.h (renamed from src/grp-import/pull-raw.h) | 0 | ||||
| -rw-r--r-- | src/grp-import/systemd-pull/pull-tar.c (renamed from src/grp-import/pull-tar.c) | 0 | ||||
| -rw-r--r-- | src/grp-import/systemd-pull/pull-tar.h (renamed from src/grp-import/pull-tar.h) | 0 | ||||
| -rw-r--r-- | src/grp-import/systemd-pull/pull.c (renamed from src/grp-import/pull.c) | 0 |
30 files changed, 206 insertions, 103 deletions
diff --git a/src/grp-import/Makefile b/src/grp-import/Makefile index 62e55c17a8..46be93c42f 100644 --- a/src/grp-import/Makefile +++ b/src/grp-import/Makefile @@ -31,109 +31,6 @@ ifneq ($(HAVE_ZLIB),) ifneq ($(HAVE_BZIP2),) ifneq ($(HAVE_GCRYPT),) -rootlibexec_PROGRAMS += \ - systemd-importd \ - systemd-pull \ - systemd-import \ - systemd-export - -systemd_importd_SOURCES = \ - src/import/importd.c - -systemd_importd_CFLAGS = \ - $(AM_CFLAGS) \ - -D SYSTEMD_PULL_PATH=\"$(rootlibexecdir)/systemd-pull\" \ - -D SYSTEMD_IMPORT_PATH=\"$(rootlibexecdir)/systemd-import\" \ - -D SYSTEMD_EXPORT_PATH=\"$(rootlibexecdir)/systemd-export\" - -systemd_importd_LDADD = \ - libshared.la - -systemd_pull_SOURCES = \ - src/import/pull.c \ - src/import/pull-raw.c \ - src/import/pull-raw.h \ - src/import/pull-tar.c \ - src/import/pull-tar.h \ - src/import/pull-job.c \ - src/import/pull-job.h \ - src/import/pull-common.c \ - src/import/pull-common.h \ - src/import/import-common.c \ - src/import/import-common.h \ - src/import/import-compress.c \ - src/import/import-compress.h \ - src/import/curl-util.c \ - src/import/curl-util.h \ - src/import/qcow2-util.c \ - src/import/qcow2-util.h - -systemd_pull_CFLAGS = \ - $(AM_CFLAGS) \ - $(LIBCURL_CFLAGS) \ - $(XZ_CFLAGS) \ - $(ZLIB_CFLAGS) \ - $(BZIP2_CFLAGS) \ - $(GCRYPT_CFLAGS) \ - -D VENDOR_KEYRING_PATH=\"$(rootlibexecdir)/import-pubring.gpg\" \ - -D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\" - -systemd_pull_LDADD = \ - libshared.la \ - $(LIBCURL_LIBS) \ - $(XZ_LIBS) \ - $(ZLIB_LIBS) \ - $(BZIP2_LIBS) \ - $(GCRYPT_LIBS) - -systemd_import_SOURCES = \ - src/import/import.c \ - src/import/import-raw.c \ - src/import/import-raw.h \ - src/import/import-tar.c \ - src/import/import-tar.h \ - src/import/import-common.c \ - src/import/import-common.h \ - src/import/import-compress.c \ - src/import/import-compress.h \ - src/import/qcow2-util.c \ - src/import/qcow2-util.h - -systemd_import_CFLAGS = \ - $(AM_CFLAGS) \ - $(XZ_CFLAGS) \ - $(ZLIB_CFLAGS) \ - $(BZIP2_CFLAGS) - -systemd_import_LDADD = \ - libshared.la \ - $(XZ_LIBS) \ - $(ZLIB_LIBS) \ - $(BZIP2_LIBS) - -systemd_export_SOURCES = \ - src/import/export.c \ - src/import/export-tar.c \ - src/import/export-tar.h \ - src/import/export-raw.c \ - src/import/export-raw.h \ - src/import/import-common.c \ - src/import/import-common.h \ - src/import/import-compress.c \ - src/import/import-compress.h - -systemd_export_CFLAGS = \ - $(AM_CFLAGS) \ - $(XZ_CFLAGS) \ - $(ZLIB_CFLAGS) \ - $(BZIP2_CFLAGS) - -systemd_export_LDADD = \ - libshared.la \ - $(XZ_LIBS) \ - $(ZLIB_LIBS) \ - $(BZIP2_LIBS) - dist_rootlibexec_DATA = \ src/import/import-pubring.gpg diff --git a/src/grp-import/systemd-export/Makefile b/src/grp-import/systemd-export/Makefile new file mode 100644 index 0000000000..d0e8781faf --- /dev/null +++ b/src/grp-import/systemd-export/Makefile @@ -0,0 +1,51 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# systemd is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +rootlibexec_PROGRAMS += systemd-export + +systemd_export_SOURCES = \ + src/import/export.c \ + src/import/export-tar.c \ + src/import/export-tar.h \ + src/import/export-raw.c \ + src/import/export-raw.h \ + src/import/import-common.c \ + src/import/import-common.h \ + src/import/import-compress.c \ + src/import/import-compress.h + +systemd_export_CFLAGS = \ + $(AM_CFLAGS) \ + $(XZ_CFLAGS) \ + $(ZLIB_CFLAGS) \ + $(BZIP2_CFLAGS) + +systemd_export_LDADD = \ + libshared.la \ + $(XZ_LIBS) \ + $(ZLIB_LIBS) \ + $(BZIP2_LIBS) + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-import/export-raw.c b/src/grp-import/systemd-export/export-raw.c index 658f835132..658f835132 100644 --- a/src/grp-import/export-raw.c +++ b/src/grp-import/systemd-export/export-raw.c diff --git a/src/grp-import/export-raw.h b/src/grp-import/systemd-export/export-raw.h index c7ac134603..c7ac134603 100644 --- a/src/grp-import/export-raw.h +++ b/src/grp-import/systemd-export/export-raw.h diff --git a/src/grp-import/export-tar.c b/src/grp-import/systemd-export/export-tar.c index 9c511984c1..9c511984c1 100644 --- a/src/grp-import/export-tar.c +++ b/src/grp-import/systemd-export/export-tar.c diff --git a/src/grp-import/export-tar.h b/src/grp-import/systemd-export/export-tar.h index 50206cabb3..50206cabb3 100644 --- a/src/grp-import/export-tar.h +++ b/src/grp-import/systemd-export/export-tar.h diff --git a/src/grp-import/export.c b/src/grp-import/systemd-export/export.c index 0a5efe5476..0a5efe5476 100644 --- a/src/grp-import/export.c +++ b/src/grp-import/systemd-export/export.c diff --git a/src/grp-import/systemd-import/Makefile b/src/grp-import/systemd-import/Makefile new file mode 100644 index 0000000000..301556ffd5 --- /dev/null +++ b/src/grp-import/systemd-import/Makefile @@ -0,0 +1,52 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# systemd is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +rootlibexec_PROGRAMS += systemd-import +systemd_import_SOURCES = \ + src/import/import.c \ + src/import/import-raw.c \ + src/import/import-raw.h \ + src/import/import-tar.c \ + src/import/import-tar.h \ + src/import/import-common.c \ + src/import/import-common.h \ + src/import/import-compress.c \ + src/import/import-compress.h \ + src/import/qcow2-util.c \ + src/import/qcow2-util.h + +systemd_import_CFLAGS = \ + $(AM_CFLAGS) \ + $(XZ_CFLAGS) \ + $(ZLIB_CFLAGS) \ + $(BZIP2_CFLAGS) + +systemd_import_LDADD = \ + libshared.la \ + $(XZ_LIBS) \ + $(ZLIB_LIBS) \ + $(BZIP2_LIBS) + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-import/import-common.c b/src/grp-import/systemd-import/import-common.c index 287a3382a1..287a3382a1 100644 --- a/src/grp-import/import-common.c +++ b/src/grp-import/systemd-import/import-common.c diff --git a/src/grp-import/import-common.h b/src/grp-import/systemd-import/import-common.h index 07d3250e71..07d3250e71 100644 --- a/src/grp-import/import-common.h +++ b/src/grp-import/systemd-import/import-common.h diff --git a/src/grp-import/import-compress.c b/src/grp-import/systemd-import/import-compress.c index f1766bbe3b..f1766bbe3b 100644 --- a/src/grp-import/import-compress.c +++ b/src/grp-import/systemd-import/import-compress.c diff --git a/src/grp-import/import-compress.h b/src/grp-import/systemd-import/import-compress.h index 6b59d0724b..6b59d0724b 100644 --- a/src/grp-import/import-compress.h +++ b/src/grp-import/systemd-import/import-compress.h diff --git a/src/grp-import/import-pubring.gpg b/src/grp-import/systemd-import/import-pubring.gpg Binary files differindex be27776896..be27776896 100644 --- a/src/grp-import/import-pubring.gpg +++ b/src/grp-import/systemd-import/import-pubring.gpg diff --git a/src/grp-import/import-raw.c b/src/grp-import/systemd-import/import-raw.c index ce37392707..ce37392707 100644 --- a/src/grp-import/import-raw.c +++ b/src/grp-import/systemd-import/import-raw.c diff --git a/src/grp-import/import-raw.h b/src/grp-import/systemd-import/import-raw.h index f0a315c088..f0a315c088 100644 --- a/src/grp-import/import-raw.h +++ b/src/grp-import/systemd-import/import-raw.h diff --git a/src/grp-import/import-tar.c b/src/grp-import/systemd-import/import-tar.c index 016d05e77d..016d05e77d 100644 --- a/src/grp-import/import-tar.c +++ b/src/grp-import/systemd-import/import-tar.c diff --git a/src/grp-import/import-tar.h b/src/grp-import/systemd-import/import-tar.h index b66b00ddfd..b66b00ddfd 100644 --- a/src/grp-import/import-tar.h +++ b/src/grp-import/systemd-import/import-tar.h diff --git a/src/grp-import/import.c b/src/grp-import/systemd-import/import.c index 338847dbc2..338847dbc2 100644 --- a/src/grp-import/import.c +++ b/src/grp-import/systemd-import/import.c diff --git a/src/grp-import/systemd-importd/Makefile b/src/grp-import/systemd-importd/Makefile new file mode 100644 index 0000000000..7911bfce82 --- /dev/null +++ b/src/grp-import/systemd-importd/Makefile @@ -0,0 +1,39 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# systemd is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +rootlibexec_PROGRAMS += systemd-importd +systemd_importd_SOURCES = \ + src/import/importd.c + +systemd_importd_CFLAGS = \ + $(AM_CFLAGS) \ + -D SYSTEMD_PULL_PATH=\"$(rootlibexecdir)/systemd-pull\" \ + -D SYSTEMD_IMPORT_PATH=\"$(rootlibexecdir)/systemd-import\" \ + -D SYSTEMD_EXPORT_PATH=\"$(rootlibexecdir)/systemd-export\" + +systemd_importd_LDADD = \ + libshared.la + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-import/importd.c b/src/grp-import/systemd-importd/importd.c index e30dfdf805..e30dfdf805 100644 --- a/src/grp-import/importd.c +++ b/src/grp-import/systemd-importd/importd.c diff --git a/src/grp-import/systemd-pull/Makefile b/src/grp-import/systemd-pull/Makefile new file mode 100644 index 0000000000..36505edb5b --- /dev/null +++ b/src/grp-import/systemd-pull/Makefile @@ -0,0 +1,64 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# systemd is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with systemd; If not, see <http://www.gnu.org/licenses/>. +include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +rootlibexec_PROGRAMS += systemd-pull +systemd_pull_SOURCES = \ + src/import/pull.c \ + src/import/pull-raw.c \ + src/import/pull-raw.h \ + src/import/pull-tar.c \ + src/import/pull-tar.h \ + src/import/pull-job.c \ + src/import/pull-job.h \ + src/import/pull-common.c \ + src/import/pull-common.h \ + src/import/import-common.c \ + src/import/import-common.h \ + src/import/import-compress.c \ + src/import/import-compress.h \ + src/import/curl-util.c \ + src/import/curl-util.h \ + src/import/qcow2-util.c \ + src/import/qcow2-util.h + +systemd_pull_CFLAGS = \ + $(AM_CFLAGS) \ + $(LIBCURL_CFLAGS) \ + $(XZ_CFLAGS) \ + $(ZLIB_CFLAGS) \ + $(BZIP2_CFLAGS) \ + $(GCRYPT_CFLAGS) \ + -D VENDOR_KEYRING_PATH=\"$(rootlibexecdir)/import-pubring.gpg\" \ + -D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\" + +systemd_pull_LDADD = \ + libshared.la \ + $(LIBCURL_LIBS) \ + $(XZ_LIBS) \ + $(ZLIB_LIBS) \ + $(BZIP2_LIBS) \ + $(GCRYPT_LIBS) + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-import/pull-common.c b/src/grp-import/systemd-pull/pull-common.c index dc4e4667a9..dc4e4667a9 100644 --- a/src/grp-import/pull-common.c +++ b/src/grp-import/systemd-pull/pull-common.c diff --git a/src/grp-import/pull-common.h b/src/grp-import/systemd-pull/pull-common.h index 929a131c88..929a131c88 100644 --- a/src/grp-import/pull-common.h +++ b/src/grp-import/systemd-pull/pull-common.h diff --git a/src/grp-import/pull-job.c b/src/grp-import/systemd-pull/pull-job.c index 6bcf35ef4e..6bcf35ef4e 100644 --- a/src/grp-import/pull-job.c +++ b/src/grp-import/systemd-pull/pull-job.c diff --git a/src/grp-import/pull-job.h b/src/grp-import/systemd-pull/pull-job.h index 3a152a50e3..3a152a50e3 100644 --- a/src/grp-import/pull-job.h +++ b/src/grp-import/systemd-pull/pull-job.h diff --git a/src/grp-import/pull-raw.c b/src/grp-import/systemd-pull/pull-raw.c index 19155cc53a..19155cc53a 100644 --- a/src/grp-import/pull-raw.c +++ b/src/grp-import/systemd-pull/pull-raw.c diff --git a/src/grp-import/pull-raw.h b/src/grp-import/systemd-pull/pull-raw.h index 6bafa6dafd..6bafa6dafd 100644 --- a/src/grp-import/pull-raw.h +++ b/src/grp-import/systemd-pull/pull-raw.h diff --git a/src/grp-import/pull-tar.c b/src/grp-import/systemd-pull/pull-tar.c index e0205c3841..e0205c3841 100644 --- a/src/grp-import/pull-tar.c +++ b/src/grp-import/systemd-pull/pull-tar.c diff --git a/src/grp-import/pull-tar.h b/src/grp-import/systemd-pull/pull-tar.h index 9ff5bd5953..9ff5bd5953 100644 --- a/src/grp-import/pull-tar.h +++ b/src/grp-import/systemd-pull/pull-tar.h diff --git a/src/grp-import/pull.c b/src/grp-import/systemd-pull/pull.c index 74df24f993..74df24f993 100644 --- a/src/grp-import/pull.c +++ b/src/grp-import/systemd-pull/pull.c |