Browse Source

Adapt dist files for Debian

rpm
J. King 3 years ago
parent
commit
837895fd6a
  1. 27
      RoboFile.php
  2. 13
      dist/debian/.gitignore
  3. 2
      dist/debian/arsse.install
  4. 2
      dist/systemd/arsse-fetch.service

27
RoboFile.php

@ -1,5 +1,6 @@
<?php <?php
use Robo\Collection\CollectionBuilder;
use Robo\Result; use Robo\Result;
const BASE = __DIR__.\DIRECTORY_SEPARATOR; const BASE = __DIR__.\DIRECTORY_SEPARATOR;
@ -173,16 +174,14 @@ class RoboFile extends \Robo\Tasks {
$archVersion = preg_replace('/^([^-]+)-(\d+)-(\w+)$/', "$1.r$2.$3", $version); $archVersion = preg_replace('/^([^-]+)-(\d+)-(\w+)$/', "$1.r$2.$3", $version);
// name the generic release tarball // name the generic release tarball
$tarball = "arsse-$version.tar.gz"; $tarball = "arsse-$version.tar.gz";
// generate the Debian changelog; this also validates our original changelog // save commit description to VERSION file for reference
$debianChangelog = $this->changelogDebian($this->changelogParse(file_get_contents($dir."CHANGELOG"), $version), $version);
// save commit description to VERSION file for use by packaging
$t->addTask($this->taskWriteToFile($dir."VERSION")->text($version)); $t->addTask($this->taskWriteToFile($dir."VERSION")->text($version));
// save the Debian changelog
$t->addTask($this->taskWriteToFile($dir."dist/debian/changelog")->text($debianChangelog));
// patch the Arch PKGBUILD file with the correct version string // patch the Arch PKGBUILD file with the correct version string
$t->addTask($this->taskReplaceInFile($dir."dist/arch/PKGBUILD")->regex('/^pkgver=.*$/m')->to("pkgver=$archVersion")); $t->addTask($this->taskReplaceInFile($dir."dist/arch/PKGBUILD")->regex('/^pkgver=.*$/m')->to("pkgver=$archVersion"));
// patch the Arch PKGBUILD file with the correct source file // patch the Arch PKGBUILD file with the correct source file
$t->addTask($this->taskReplaceInFile($dir."dist/arch/PKGBUILD")->regex('/^source=\("arsse-[^"]+"\)$/m')->to('source=("'.basename($tarball).'")')); $t->addTask($this->taskReplaceInFile($dir."dist/arch/PKGBUILD")->regex('/^source=\("arsse-[^"]+"\)$/m')->to('source=("'.basename($tarball).'")'));
// Prepare Debian-related files
$this->prepDebian($t, $dir, $version);
// perform Composer installation in the temp location with dev dependencies // perform Composer installation in the temp location with dev dependencies
$t->addTask($this->taskComposerInstall()->arg("-q")->dir($dir)); $t->addTask($this->taskComposerInstall()->arg("-q")->dir($dir));
// generate manpages // generate manpages
@ -196,6 +195,7 @@ class RoboFile extends \Robo\Tasks {
$dir.".git", $dir.".git",
$dir.".gitignore", $dir.".gitignore",
$dir.".gitattributes", $dir.".gitattributes",
$dir."dist/debian/.gitignore",
$dir."composer.json", $dir."composer.json",
$dir."composer.lock", $dir."composer.lock",
$dir.".php_cs.dist", $dir.".php_cs.dist",
@ -462,4 +462,21 @@ class RoboFile extends \Robo\Tasks {
} }
return $out; return $out;
} }
protected function prepDebian(CollectionBuilder $t, string $dir, string $version): void {
// generate the Debian changelog; this also validates our original changelog
$debianChangelog = $this->changelogDebian($this->changelogParse(file_get_contents($dir."CHANGELOG"), $version), $version);
// save the Debian changelog
$t->addTask($this->taskWriteToFile($dir."dist/debian/changelog")->text($debianChangelog));
// adapt the systemd unit for Debian: this involves using only the "arsse-fetch" unit (renamed to "arsse"), removing the "PartOf" directive, and changing the user and group to "www-data"
$t->addTask($this->taskFilesystemStack()->copy($dir."dist/systemd/arsse-fetch.service", $dir."dist/debian/arsse.service"));
$t->addTask($this->taskReplaceInFile($dir."/dist/debian/arsse.service")->regex('/^PartOf=.*$/m')->to(""));
$t->addTask($this->taskReplaceInFile($dir."/dist/debian/arsse.service")->regex('/^(User|Group)=.*$/m')->to("$1=www-data"));
// change the user and group references in tmpfiles
$t->addTask($this->taskFilesystemStack()->copy($dir."dist/tmpfiles.conf", $dir."dist/debian/arsse.tmpfiles"));
$t->addTask($this->taskReplaceInFile($dir."dist/debian/arsse.tmpfiles")->regex('/(?<= )arsse(?= )/')->to("www-data"));
// change the user reference in the executable file
$t->addTask($this->taskFilesystemStack()->copy($dir."dist/arsse", $dir."dist/debian/arsse"));
$t->addTask($this->taskReplaceInFile($dir."dist/debian/arsse")->from('posix_getpwnam("arsse"')->to('posix_getpwnam("www-data"'));
}
} }

13
dist/debian/.gitignore

@ -0,0 +1,13 @@
*
!.gitignore
!arsse.install
!compat
!control
!copyright
!lintian-overrides
!rules
!source/
source/*
!source/lintian-overrides
!source/format

2
dist/debian/arsse.install

@ -8,7 +8,7 @@ UPGRADING usr/share/arsse/
README.md usr/share/arsse/ README.md usr/share/arsse/
arsse.php usr/share/arsse/ arsse.php usr/share/arsse/
dist/arsse usr/bin/ dist/debian/arsse usr/bin/
manual usr/share/doc/arsse/ manual usr/share/doc/arsse/
dist/man/* usr/share/man/ dist/man/* usr/share/man/
dist/nginx etc/arsse/ dist/nginx etc/arsse/

2
dist/systemd/arsse-fetch.service

@ -33,4 +33,4 @@ RestartPreventStatus=
#ReadOnlyPaths=/ #ReadOnlyPaths=/
#ReadWriePaths=/var/lib/arsse #ReadWriePaths=/var/lib/arsse
#NoExecPaths=/ #NoExecPaths=/
#ExecPaths=/usr/bin/php /usr/bin/php7 #ExecPaths=/usr/bin/php

Loading…
Cancel
Save