diff --git a/arch/autorepo/autorepo.xsd b/arch/autorepo/autorepo.xsd deleted file mode 100644 index 27622ac..0000000 --- a/arch/autorepo/autorepo.xsd +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/arch/autorepo/build.py b/arch/autorepo/build.py deleted file mode 100755 index 5256069..0000000 --- a/arch/autorepo/build.py +++ /dev/null @@ -1,191 +0,0 @@ -#!/usr/bin/env python3 - -# TODO: make as flexible as the :/bin/build.py (flesh out args), logging, etc. - -import argparse -import datetime -import copy -import io -import os -import pathlib -import re -import shutil -import subprocess -import tarfile -import tempfile -import warnings -## -import gpg -import requests -from lxml import etree - - -# TODO: track which versions are built so we don't need to consistently rebuild ALL packages -# TODO: should this be a configuration option? -aurbase = 'https://aur.archlinux.org' - -_dflts = {'cfgfile': '~/.config/optools/arch/autorepo.xml'} - - -class Packager(object): - def __init__(self, cfgfile = _dflts['cfgfile'], *args, **kwargs): - user_params = kwargs - self.args = copy.deepcopy(_dflts) - self.args.update(user_params) - self.origdir = os.path.abspath(os.path.expanduser(os.getcwd())) - self.gpg = None - self.args['destdir'] = os.path.abspath(os.path.expanduser(self.args['destdir'])) - if not self.args['pkgs']: - self.args['pkgs'] = _dflts['pkgs'] - self._initSigner() - - def buildPkgs(self, auronly = None): - for p in self.args['pkgs']: - print(p) - extract_dir = tempfile.mkdtemp(prefix = '.pkgbuilder.{0}-'.format(p)) - sub_extract_dir = os.path.join(extract_dir, p) - has_pkg = False - if not auronly: - has_pkg = self._getLocal(p, extract_dir) - if not has_pkg: - has_pkg = self._getAUR(p, extract_dir) - if not has_pkg: - warnings.warn('Could not find package {0}; skipping...'.format(p)) - continue - # We get a list of files to compare. - prebuild_files = [] - postbuild_files = [] - for root, dirs, files in os.walk(sub_extract_dir): - for f in files: - prebuild_files.append(os.path.join(root, f)) - os.chdir(os.path.join(extract_dir, p)) - # customizepkg-scripting in AUR - try: - custpkg_out = subprocess.run(['/usr/bin/customizepkg', - '-m'], - stdout = subprocess.PIPE, - stderr = subprocess.PIPE) - except FileNotFoundError: - pass # Not installed - build_out = subprocess.run(['/usr/bin/multilib-build', - '-c', - '--', - '--', - '--skippgpcheck', - '--syncdeps', - '--noconfirm', - '--log', - '--holdver', - '--skipinteg'], - stdout = subprocess.PIPE, - stderr = subprocess.PIPE) - # with open('/tmp/build.log-{0}'.format(p), 'w') as f: - # f.write(build_out.stdout.decode('utf-8')) - for root, dirs, files in os.walk(sub_extract_dir): - for f in files: - fpath = os.path.join(root, f) - if fpath in prebuild_files: - continue - if fpath.endswith('.log'): - continue - postbuild_files.append(fpath) - postbuild_files = [i for i in postbuild_files if i.endswith('.pkg.tar.xz')] - if len(postbuild_files) != 1: - warnings.warn('Could not reliably find a built package for {0}; skipping'.format(p)) - else: - fdest = os.path.join(self.args['destdir'], - os.path.basename(postbuild_files[0])) - if os.path.isfile(fdest): - os.remove(fdest) - shutil.move(postbuild_files[0], fdest) - self._sign(fdest) - os.chdir(self.origdir) - shutil.rmtree(extract_dir) - return() - - def _initSigner(self): - self.gpg = gpg.Context() - # Just grab the first private key until we flesh this out. - for k in self.gpg.keylist(secret = True): - if k.can_sign: - self.gpg.signers = [k] - break - return() - - def _getAUR(self, pkgnm, extract_dir): - dl_url = None - pkg_srch = requests.get(os.path.join(self.args['aurbase'], - 'rpc'), - params = { - 'v': 5, - 'type': 'search', - 'by': 'name', - 'arg': pkgnm}).json() - for pkg in pkg_srch['results']: - dl_url = None - if pkg['Name'] == pkgnm: - dl_url = os.path.join(self.args['aurbase'], re.sub('^/+', '', pkg['URLPath'])) - # dl_file = os.path.basename(pkg['URLPath']) - break - if not dl_url: - warnings.warn('Could not find a download path for {0}; skipping'.format(pkgnm)) - return(False) - with requests.get(dl_url, stream = True) as url: - with tarfile.open(mode = 'r|*', fileobj = io.BytesIO(url.content)) as tar: - tar.extractall(extract_dir) - return(True) - - def _getLocal(self, pkgnm, extract_dir): - curfile = os.path.realpath(os.path.abspath(os.path.expanduser(__file__))) - localpkg_dir = os.path.abspath(os.path.join(os.path.dirname(curfile), - '..', - 'local_pkgs')) - pkgbuild_dir = os.path.join(localpkg_dir, - pkgnm) - if not os.path.isdir(pkgbuild_dir): - return(False) - shutil.copytree(pkgbuild_dir, os.path.join(extract_dir, pkgnm)) - return(True) - - def _sign(self, pkgfile, passphrase = None): - sigfile = '{0}.sig'.format(pkgfile) - with open(pkgfile, 'rb') as pkg: - with open(sigfile, 'wb') as sig: - # We want ascii-armoured detached sigs - sig.write(self.gpg.sign(pkg.read(), mode = gpg.constants.SIG_MODE_DETACH)[0]) - return() - - def createRepo(self): - pkgfiles = [] - for root, dirs, files in os.walk(self.args['destdir']): - for f in files: - if f.endswith('.pkg.tar.xz'): - pkgfiles.append(os.path.join(root, f)) - repo_out = subprocess.run(['/usr/bin/repo-add', - '-s', - '-R', - os.path.join(self.args['destdir'], '{0}.db.tar.xz'.format(self.args['reponame'])), - *pkgfiles], - stdout = subprocess.PIPE, - stderr = subprocess.PIPE) - return() - - -def parseArgs(): - args = argparse.ArgumentParser(description = 'Build Pacman packages and update a local repository') - args.add_argument('-c', '--config', - dest = 'cfgfile', - default = _dflts['cfgfile'], - help = ('The path to the configuration file. Default: {0}').format(_dflts['cfgfile'])) - return(args) - -def main(): - args = parseArgs().parse_args() - varargs = vars(args) - pkgr = Packager(**varargs) - pkgr.buildPkgs(auronly = varargs['auronly']) - pkgr.createRepo() - return() - -if __name__ == '__main__': - main() diff --git a/arch/autorepo/example.pkgs.xml b/arch/autorepo/example.pkgs.xml deleted file mode 100644 index 8942485..0000000 --- a/arch/autorepo/example.pkgs.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - /path/to/path - a/relative/path - - /path/to/remote/path - - - - - - somepkg - - pkgnm - pkgnm2 - - - \ No newline at end of file diff --git a/arch/autorepo/readme.txt b/arch/autorepo/readme.txt deleted file mode 100644 index 09b89ba..0000000 --- a/arch/autorepo/readme.txt +++ /dev/null @@ -1,9 +0,0 @@ -This has a lot of work pending. I need to factor in configuration files, etc. - -But it does require the following packages to be installed, and the buildbox (not the repo mirror server itself) needs to be Arch: - -- pacman (duh) -- namcap -- devtools (for https://wiki.archlinux.org/index.php/DeveloperWiki:Building_in_a_clean_chroot) - -It is designed to be run as a *non-root* user. Use the regen_sudoers.py script to create a sudoers CMND_ALIAS (https://www.sudo.ws/man/1.7.10/sudoers.man.html) to add for your packaging user. diff --git a/arch/autorepo/regen_sudoers.py b/arch/autorepo/regen_sudoers.py deleted file mode 100755 index 8dd8454..0000000 --- a/arch/autorepo/regen_sudoers.py +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env python3 - -import re - -sudo_cmds = [] - -# All of these commands... -cmds = ['/usr/bin/extra-x86_64-build', - '/usr/bin/testing-x86_64-build', - '/usr/bin/staging-x86_64-build', - '/usr/bin/multilib-build', - '/usr/bin/multilib-testing-build', - '/usr/bin/multilib-staging-build', - '/usr/bin/makechrootpkg'] - -# Should allow all of these args. -args = ['-c', - '-c -- -- --skippgpcheck --syncdeps --noconfirm --log --holdver --skipinteg', - '-- -- --skippgpcheck --syncdeps --noconfirm --log --holdver --skipinteg'] - -for c in cmds: - for a in args: - sudo_cmds.append('{0} {1}'.format(c, a)) - -s = '' - -s += 'Cmnd_Alias\tPKGBUILDER = \\\n' -for c in sudo_cmds: - s += '\t\t\t\t{0}, \\\n'.format(c) - -s = re.sub(r', \\s*$', '', s) -print(s) - diff --git a/arch/autorepo/sync.sh b/arch/autorepo/sync.sh deleted file mode 100755 index 32a5537..0000000 --- a/arch/autorepo/sync.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -# This obviously will require some tweaking. Will roll into build.py later. -set -e - -server=my_repo.domain.tld -port=2222 -user=pkgrepo -src=~/pkgs/built/. -# You should use rrsync to restrict to a specific directory -dest='Arch/.' - -echo "Syncing..." -rsync -a --delete -e "ssh -p ${port}" ${src} ${user}@${server}:${dest} -echo "Done."