cmd/pkgserver: fix gitignore

Packaging nodejs and ruby is an immense burden for the Rosa OS base system, and these files diff poorly.

Signed-off-by: Ophestra <cat@gensokyo.uk>

cmd/pkgserver/main.go

@@ -47,7 +47,7 @@ func main() {
 				return err
 			}
 
-			cache, err = pkg.Open(ctx, msg, 0, 0, 0, baseDir)
+			cache, err = pkg.Open(ctx, msg, 0, 0, baseDir)
 			if err != nil {
 				return err
 			}

internal/rosa/meson.go

@@ -10,46 +10,26 @@ import (
 func (t Toolchain) newMeson() (pkg.Artifact, string) {
 	const (
 		version  = "1.11.0"
-		checksum = "QJolMPzypTiS65GReSNPPlkUjHI6b1EDpZ-avIk3n6b6TQ93KfUM57DVUpY97Hf7"
+		checksum = "b7oo3U_cklhzsTfsyYsjPGyeEufiS-Pm06JPLzodseS125Ach62ZBly7R6dSDiAc"
 	)
-	return t.NewPackage("meson", version, newFromGitHub(
+	return t.New("meson-"+version, 0, []pkg.Artifact{
+		t.Load(Zlib),
+		t.Load(Python),
+		t.Load(Setuptools),
+	}, nil, nil, `
+cd /usr/src/meson
+chmod -R +w meson.egg-info
+python3 setup.py \
+	install \
+	--prefix=/system \
+	--root=/work
+`, pkg.Path(AbsUsrSrc.Append("meson"), true, newFromGitHubRelease(
 		"mesonbuild/meson",
 		version,
+		"meson-"+version+".tar.gz",
 		checksum,
-	), &PackageAttr{
+		pkg.TarGzip,
-		Env: []string{
+	))), version
-			"CMAKE_MAKE_PROGRAM=ninja",
-		},
-	}, &PipHelper{
-		EnterSource: true,
-		Script: `
-cd 'test cases'
-rm -rf \
-	'common/32 has header' \
-	'common/66 vcstag' \
-	'common/153 wrap file should not failed' \
-	'common/184 openmp' \
-	'common/189 check header' \
-	'linuxlike/6 subdir include order' \
-	'linuxlike/9 compiler checks with dependencies' \
-	'linuxlike/13 cmake dependency' \
-	'frameworks/15 llvm' \
-	'frameworks/29 blocks'
-cd ..
-
-python3 ./run_project_tests.py \
-	-v \
-	` + jobsFlagE + ` \
-	--failfast \
-	--backend=ninja
-`,
-	},
-		Setuptools,
-		PkgConfig,
-		CMake,
-		Ninja,
-		PythonPyTest,
-	), version
 }
 func init() {
 	artifactsM[Meson] = Metadata{

internal/rosa/python.go

@@ -81,62 +81,6 @@ func init() {
 	}
 }
 
-// PipHelper is the [Python] pip packaging helper.
-type PipHelper struct {
-	// Whether to omit --no-build-isolation.
-	BuildIsolation bool
-	// Whether to enter source after install.
-	EnterSource bool
-	// Runs after install.
-	Script string
-}
-
-var _ Helper = new(PipHelper)
-
-// extra returns python.
-func (*PipHelper) extra(int) P { return P{Python} }
-
-// wantsChmod returns true.
-func (*PipHelper) wantsChmod() bool { return true }
-
-// wantsWrite is equivalent to wantsChmod.
-func (attr *PipHelper) wantsWrite() bool { return attr.wantsChmod() }
-
-// scriptEarly is a noop.
-func (*PipHelper) scriptEarly() string { return "" }
-
-// createDir returns false.
-func (*PipHelper) createDir() bool { return false }
-
-// wantsDir requests a new directory in TMPDIR.
-func (*PipHelper) wantsDir() string { return `"$(mktemp -d)"` }
-
-// script generates the pip3 install command.
-func (attr *PipHelper) script(name string) string {
-	if attr == nil {
-		attr = new(PipHelper)
-	}
-
-	var extra string
-	if !attr.BuildIsolation {
-		extra += `
-	--no-build-isolation \`
-	}
-
-	script := attr.Script
-	if attr.EnterSource {
-		script = "cd '/usr/src/" + name + "'\n" + script
-	}
-
-	return `
-pip3 install \
-	--no-index \
-	--prefix=/system \
-	--root=/work \` + extra + `
-	'/usr/src/` + name + `'
-` + script
-}
-
 // newViaPip installs a pip wheel from a url.
 func (t Toolchain) newViaPip(
 	name, version, url, checksum string,
@@ -190,12 +134,18 @@ func (t Toolchain) newSetuptools() (pkg.Artifact, string) {
 		version  = "82.0.1"
 		checksum = "nznP46Tj539yqswtOrIM4nQgwLA1h-ApKX7z7ghazROCpyF5swtQGwsZoI93wkhc"
 	)
-	return t.NewPackage("setuptools", version, newFromGitHub(
+	return t.New("setuptools-"+version, 0, t.AppendPresets(nil,
+		Python,
+	), nil, nil, `
+pip3 install \
+	--no-index \
+	--prefix=/system \
+	--root=/work \
+	/usr/src/setuptools
+`, pkg.Path(AbsUsrSrc.Append("setuptools"), true, newFromGitHub(
 		"pypa/setuptools",
 		"v"+version, checksum,
-	), nil, &PipHelper{
+	))), version
-		BuildIsolation: true,
-	}), version
 }
 func init() {
 	artifactsM[Setuptools] = Metadata{