diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2017-05-10 18:16:31 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2017-05-10 18:16:31 -0400 |
| commit | f375f601941dde66d8357fb22f560cea80d97fd4 (patch) | |
| tree | d4c04c115c936e84b2203c0be79b37abc390aa3a | |
| parent | 50fe39c364ef1ab10c00536838b03f9e10b9c3dc (diff) | |
| parent | a71cce3a247e67290db2b49724ec6683662485c3 (diff) | |
Merge branch 'notsystemd/postmove' into notsystemd/master
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | src/grp-machine/grp-import/systemd-importd/Makefile | 3 | ||||
| -rw-r--r-- | src/grp-machine/grp-import/systemd-pull/Makefile | 3 | ||||
| -rw-r--r-- | src/grp-machine/grp-import/systemd-pull/import-pubring.gpg (renamed from src/grp-machine/grp-import/systemd-import/import-pubring.gpg) | bin | 9551 -> 9551 bytes | |||
| -rwxr-xr-x | tools/notsd-move | 7 |
5 files changed, 9 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index f032bfa65f..aeebb59732 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5493,10 +5493,11 @@ systemd_export_LDADD = \ $(ZLIB_LIBS) \ $(BZIP2_LIBS) -#@auto/systemd-importd/Makefile +#@auto/systemd-pull/Makefile dist_rootlibexec_DATA += \ src/import/import-pubring.gpg +#@auto/systemd-importd/Makefile nodist_systemunit_DATA += \ units/systemd-importd.service diff --git a/src/grp-machine/grp-import/systemd-importd/Makefile b/src/grp-machine/grp-import/systemd-importd/Makefile index 58b760ea86..65537f7601 100644 --- a/src/grp-machine/grp-import/systemd-importd/Makefile +++ b/src/grp-machine/grp-import/systemd-importd/Makefile @@ -36,9 +36,6 @@ systemd_importd_LDADD = \ libsystemd-internal.la \ libsystemd-shared.la -dist_rootlibexec_DATA += \ - src/import/import-pubring.gpg - nodist_systemunit_DATA += \ units/systemd-importd.service diff --git a/src/grp-machine/grp-import/systemd-pull/Makefile b/src/grp-machine/grp-import/systemd-pull/Makefile index 0b593158e4..2254ac651b 100644 --- a/src/grp-machine/grp-import/systemd-pull/Makefile +++ b/src/grp-machine/grp-import/systemd-pull/Makefile @@ -55,4 +55,7 @@ systemd_pull_LDADD = \ $(BZIP2_LIBS) \ $(GCRYPT_LIBS) +dist_rootlibexec_DATA += \ + src/import/import-pubring.gpg + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-machine/grp-import/systemd-import/import-pubring.gpg b/src/grp-machine/grp-import/systemd-pull/import-pubring.gpg Binary files differindex be27776896..be27776896 100644 --- a/src/grp-machine/grp-import/systemd-import/import-pubring.gpg +++ b/src/grp-machine/grp-import/systemd-pull/import-pubring.gpg diff --git a/tools/notsd-move b/tools/notsd-move index 30f63d354f..4c4c916701 100755 --- a/tools/notsd-move +++ b/tools/notsd-move @@ -205,13 +205,14 @@ move_files() ( src/import/.gitignore \ src/import/importd.c \ src/import/org.* - mkdir src/systemd-import - mv -t src/systemd-import \ - src/import/import* mkdir src/systemd-pull mv -t src/systemd-pull \ + src/import/import-pubring.gpg \ src/import/pull* \ src/import/curl-util* + mkdir src/systemd-import + mv -t src/systemd-import \ + src/import/import* rmdir src/import # src/journal => src/... |