From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Sat, 14 Sep 2019 02:17:02 +0000 (-0700)
Subject: dsynth - Fix repository generation
X-Git-Tag: v5.8.0rc1~911
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/cda252a4e610a736cf4a6aebd8e2c5acc1cffec6

dsynth - Fix repository generation

* pkg repo generates .txz files no matter what the suffix.  So if the
  suffix is not .txz we have to recompress the results.

* Supply the base path to pkg repo (sans the '/All') so the generated
  yaml properly specififes the relative path "All/blahblah".  Otherwise
  the generated yaml will just generate "blahblah" and rmeote accesses
  wont be able to find the packages.
---

diff --git a/usr.bin/dsynth/repo.c b/usr.bin/dsynth/repo.c
index e2091b8d7e..40c5eb06e5 100644
--- a/usr.bin/dsynth/repo.c
+++ b/usr.bin/dsynth/repo.c
@@ -110,6 +110,10 @@ DoRebuildRepo(int ask)
 	remove(tpath);
 }
 
+static void
+repackage(const char *basepath, const char *basefile, const char *sufx,
+	  const char *comp, const char *decomp);
+
 static void
 childRebuildRepo(bulk_t *bulk)
 {
@@ -127,10 +131,16 @@ childRebuildRepo(bulk_t *bulk)
 	cav[cac++] = bulk->s1;
 	cav[cac++] = "-o";
 	cav[cac++] = PackagesPath;
-	cav[cac++] = RepositoryPath;
 
-	printf("pkg repo -m %s -o %s %s\n",
-	       bulk->s1, PackagesPath, RepositoryPath);
+	/*
+	 * The yaml needs to generate paths relative to PackagePath
+	 */
+	if (strncmp(PackagesPath, RepositoryPath, strlen(PackagesPath)) == 0)
+		cav[cac++] = PackagesPath;
+	else
+		cav[cac++] = RepositoryPath;
+
+	printf("pkg repo -m %s -o %s %s\n", bulk->s1, cav[cac-2], cav[cac-1]);
 
 	fp = dexec_open(cav, cac, &pid, NULL, 1, 0);
 	while ((ptr = fgetln(fp, &len)) != NULL)
@@ -138,6 +148,48 @@ childRebuildRepo(bulk_t *bulk)
 	if (dexec_close(fp, pid) == 0) {
 		bulk->r1 = strdup("");
 	}
+
+	/*
+	 * Repackage the .txz files created by pkg repo if necessary
+	 */
+	if (strcmp(USE_PKG_SUFX, ".txz") != 0) {
+		const char *comp;
+		const char *decomp;
+
+		if (strcmp(USE_PKG_SUFX, ".tar") == 0) {
+			decomp = "unxz";
+			comp = "cat";
+		} else if (strcmp(USE_PKG_SUFX, ".tgz") == 0) {
+			decomp = "unxz";
+			comp = "gzip";
+		} else if (strcmp(USE_PKG_SUFX, ".tbz") == 0) {
+			decomp = "unxz";
+			comp = "bzip";
+		} else {
+			dfatal("repackaging as %s not supported", USE_PKG_SUFX);
+			decomp = "unxz";
+			comp = "cat";
+		}
+		repackage(PackagesPath, "digests", USE_PKG_SUFX,
+			  comp, decomp);
+		repackage(PackagesPath, "packagesite", USE_PKG_SUFX,
+			  comp, decomp);
+	}
+}
+
+static
+void
+repackage(const char *basepath, const char *basefile, const char *sufx,
+	  const char *comp, const char *decomp)
+{
+	char *buf;
+
+	asprintf(&buf, "%s < %s/%s.txz | %s > %s/%s%s",
+		decomp, basepath, basefile, comp, basepath, basefile, sufx);
+	if (system(buf) != 0) {
+		dfatal("command failed: %s", buf);
+	}
+	free(buf);
 }
 
 void