diff options
| author | Chunhua Liu <chunhua1.liu@samsung.com> | 2018-04-24 09:04:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal> | 2018-04-24 09:04:56 +0000 |
| commit | 74c0b4013ed3aa07d985e158dd24c2259fdd39d5 (patch) | |
| tree | 7e233649c3876c98e2cecf3a392241165015447f | |
| parent | df240dc49a93d209943ea3e5f463ce7c1f677a46 (diff) | |
| parent | d2eae3536e75f5a9be27ab01c006490cb06b899a (diff) | |
| download | rpm-74c0b4013ed3aa07d985e158dd24c2259fdd39d5.tar.gz rpm-74c0b4013ed3aa07d985e158dd24c2259fdd39d5.tar.bz2 rpm-74c0b4013ed3aa07d985e158dd24c2259fdd39d5.zip | |
Merge "Single security manifest in debuginfo package" into tizen_basesubmit/tizen_base/20180607.041826sandbox/soong9/rpm_4.14.1sandbox/dnxowls/rpm_4.14.1_upgrade
| -rw-r--r-- | build/files.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build/files.c b/build/files.c index c4d54fc88..6f2cc7d98 100644 --- a/build/files.c +++ b/build/files.c @@ -2307,9 +2307,6 @@ static void addDebuginfoPackage(rpmSpec spec, Package pkg, char *buildroot) if (access (tmp, F_OK) != 0) continue; - /* Add security manifest to set right SMACK labels */ - argvAdd(&files, "%manifest %{name}-debuginfo.manifest"); - /* Append the file list preamble. */ if (!files) { @@ -2352,6 +2349,9 @@ static void addDebuginfoPackage(rpmSpec spec, Package pkg, char *buildroot) new debuginfo package. */ if (files) { + /* Add security manifest to set right SMACK labels */ + argvAdd(&files, "%manifest %{name}-debuginfo.manifest"); + dbg = newPackage (spec); headerNVR (pkg->header, &name, NULL, NULL); /* Set name, summary and group. */ |