Skip to content

Commit

Permalink
pisi/eopkg: Sync with deterministic upstream versions (#2964)
Browse files Browse the repository at this point in the history
**Summary**

Constitutes phase 2 of #2193

**eopkg**
- Remove eopkg4-bin symlink. Use eopkg.bin instead.
- eopkg.bin and eopkg.py3 will now deterministically install baselayout
and eopkg packages before anything else.
- Add eopkg to system.base in preparation for epoch bump process.
- Add mirrors.conf and sandbox.conf files in preparation for epoch bump
process ownership changes between pisi(py2) and eopkg(py3) packages.

**pisi**
- Sync with pisi v3.12 upstream release, which always installs
baselayout eopkg first if they are present in any given install/upgrade
order.
- Add rundep on python2-ordered-set package
- Make pisi co-installable with the eopkg(py3) package
- Miscellaneous shebang and file name extension changes
- Sort pspec.xml file sections lexically for ease of reading/tweaking
- Change long_description to indicate that pisi is now considered legacy
- Create new comar/manager.py3 and comar/package.py3 build scripts in
preparation for enabling building pisi with `eopkg.py3 build`.
Thank you to @ultr4_l4s3r for the porting work. The current comar/*.py
scripts are still python2 for now.

**ypkg**
_(no changes necessary)_

**solus-sc**
_(no changes necessary)_

**Test Plan**
1. build + install eopkg&python-eopkg, and add them to my local repo (as
a separate step).
2. build + install pisi, and add it to the local repo (as a separate
step).
3. test that solus-sc still works. (as the final step).

**Checklist**

- [x] Package was built and tested against unstable
  • Loading branch information
ermo authored Jun 24, 2024
2 parents 8658259 + 02f1d61 commit f5b5bae
Show file tree
Hide file tree
Showing 8 changed files with 649 additions and 118 deletions.
224 changes: 224 additions & 0 deletions packages/e/eopkg/files/mirrors.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,224 @@
apache http://www.eu.apache.org/dist/
apache http://www.apache.org/dist/
apache http://apache.planetmirror.com.au/dist/
apache http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/
apache http://apache.fastorama.com/dist/
apache http://mir2.ovh.net/ftp.apache.org/dist/
apache ftp://ftp.planetmirror.com/pub/apache/dist/
apache ftp://gd.tuwien.ac.at/pub/infosys/servers/http/apache/dist/
apache ftp://ftp.fastorama.com/mirrors/ftp.apache.org/dist/
berlios http://download.berlios.de/
berlios http://download2.berlios.de/
cpan http://search.cpan.org/CPAN/
cpan http://cpan.ulak.net.tr/
cpan http://www.perl.com/CPAN/
cpan http://mirrors.jtlnet.com/CPAN/
cpan ftp://ftp.ncsu.edu/pub/mirror/CPAN/
cpan ftp://ftp.duke.edu/pub/perl/
gnome http://ftp.gnome.org/pub/GNOME/sources
gnome http://ftp.rpmfind.net/linux/gnome.org/sources/
gnome http://ftp.unina.it/pub/linux/GNOME/sources/
gnome http://ftp.acc.umu.se/pub/GNOME/sources/
gnome http://ftp.belnet.be/mirror/ftp.gnome.org/sources/
gnome ftp://ftp.cse.buffalo.edu/pub/Gnome/sources/
gnu http://ftp.gnu.org/gnu/
gnu ftp://ftp.gnu.org/gnu/
gnu http://ftp.club.cc.cmu.edu/pub/gnu/
gnu http://mirrors.usc.edu/pub/gnu/
gnu http://mirrors.kernel.org/gnu/
gnu ftp://ftp.club.cc.cmu.edu/gnu/
gnu ftp://aeneas.mit.edu/pub/gnu/
gnu ftp://ftp.cse.ohio-state.edu/mirror/gnu/
gnu ftp://ftp.cs.tu-berlin.de/pub/gnu/
gnu ftp://mirrors.kernel.org/gnu/
gnu ftp://ftp.cs.ubc.ca/pub/gnu/
gnu ftp://ftp.math.uni-bremen.de/pub/gnu/
gnu ftp://ftp.informatik.rwth-aachen.de/pub/gnu/
gnu ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.gnu.org/
gnu ftp://ftp.mirror.ac.uk/sites/ftp.gnu.org/gnu/
gnu ftp://sunsite.cnlab-switch.ch/mirror/gnu/
gnu http://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.gnu.org/
gnu ftp://ftp.stacken.kth.se/pub/gnu/
gnu ftp://ftp.isy.liu.se/pub/gnu/
gnu ftp://ftp.task.gda.pl/pub/gnu/
gnu ftp://ftp.nluug.nl/pub/gnu/
gnu ftp://ftp.funet.fi/pub/gnu/prep/
gnu ftp://sunsite.icm.edu.pl/pub/gnu/
gnu ftp://ftp.freenet.de/pub/mirrors.ibiblio.org/pub/mirrors/gnu/ftp/gnu/
gnu ftp://ftp.mirror.nl/pub/mirror/gnu/
gnu ftp://ftp.esat.net/pub/gnu/
gnu ftp://ftp.mcc.ac.uk/pub/gnu/
gnu ftp://ftp.cise.ufl.edu/pub/mirrors/GNU/
gnu ftp://ftp.uninett.no/pub/gnu/
gnu ftp://ftp.duth.gr/pub/gnu/
gnu ftp://sunsite.dk/mirrors/gnu/
gnu http://mirrors.sunsite.dk/gnu/
gnu ftp://ftp.etsimo.uniovi.es/pub/gnu/
gnu ftp://ftp.sunet.se/pub/gnu/
gnu http://ftp.roedu.net/mirrors/gnu.org/
gnu ftp://ftp.forthnet.gr/pub/gnu/
gnu ftp://ftp.univie.ac.at/packages/gnu/
gnu ftp://core.ring.gr.jp/pub/GNU/
gnu ftp://ftp.cs.cuhk.edu.hk/pub/gnu/gnu/
gnu ftp://tron.um.u-tokyo.ac.jp/pub/GNU/
gnu http://ftp.azc.uam.mx/mirrors/gnu/
gnu ftp://ftp.kaist.ac.kr/gnu/
gnu ftp://ftp.chg.ru/pub/gnu/
gnu ftp://ftp.inf.utfsm.cl/pub/gnu/
gnu ftp://ftp.arnes.si/software/gnu/
gnu ftp://gnu.cs.lewisu.edu/gnu/
gnu http://ftp.wayne.edu/pub/gnu/
gnu ftp://ftp.wayne.edu/pub/gnu/
gnu http://kambing.vlsm.org/gnu/
gnu http://gd.tuwien.ac.at/gnu/gnusrc/
kde http://download.kde.org/
kde http://master.kde.org/
kde ftp://ftp.kde.org/pub/kde/
kde http://ftp.icm.edu.pl/pub/unix/kde/
kde http://ftp.pbone.net/pub/kde/
kde http://ftp.fi.muni.cz/pub/kde/
kde http://mirror.karneval.cz/pub/kde/
kde http://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/
kde http://ftp.rz.uni-wuerzburg.de/pub/unix/kde/
kde http://ftp-stud.fht-esslingen.de/Mirrors/ftp.kde.org/pub/kde/
kde http://ftp5.gwdg.de/pub/linux/kde/
kde http://fr2.rpmfind.net/linux/KDE/
kde http://archive.sunet.se/pub/X11/kde/
kde http://vesta.informatik.rwth-aachen.de/ftp/pub/mirror/kde/
kde http://mirrors.dotsrc.org/kde/
kde http://ftp.nluug.nl/pub/windowing/kde/
kde http://ftp.SURFnet.nl/windowing/kde/
kde http://kde-mirror.freenux.org/stable/
kde http://www-ftp.lip6.fr/pub/X11/kde/
kde http://mirrors.ircam.fr/pub/KDE/
kde http://www.mirrorservice.org/sites/ftp.kde.org/pub/kde/
kde http://kde.mirror.anlx.net/
kde http://mirror.catn.com/pub/kde/
kde http://mirrors.fe.up.pt/pub/kde/
kde http://ftp.heanet.ie/mirrors/ftp.kde.org/
kde http://ftp.rhnet.is/pub/kde/
kde http://chernabog.cc.vt.edu/pub/projects/kde/
kde http://ftp.gtlib.cc.gatech.edu/pub/kde/
kde ftp://chernabog.cc.vt.edu/pub/projects/kde/
kde ftp://ftp.gtlib.cc.gatech.edu/pub/kde/
kde ftp://carroll.aset.psu.edu/pub/kde/
kde ftp://ftp.oregonstate.edu/pub/kde/
kde ftp://ftp.ussg.iu.edu/pub/kde/
kde http://mirrors.isc.org/pub/kde/
kde http://mirror.karneval.cz/pub/kde/
kde http://ftp.belnet.be/packages/kde/
kde http://ftp.fi.muni.cz/pub/kde/
kde http://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/
kde http://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/
kde http://ftp.rhnet.is/pub/kde/
kde http://ftp-stud.fht-esslingen.de/Mirrors/ftp.kde.org/pub/kde/
kde http://ftp.tiscali.nl/kde/
kde http://mirrors.isc.org/pub/kde/
kde http://sunsite.icm.edu.pl/pub/unix/kde/
kde ftp://ftp.belnet.be/packages/kde/
kde ftp://ftp.estpak.ee/pub/kde/
kde ftp://ftp.fu-berlin.de/pub/unix/X11/gui/kde/
kde ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.kde.org/pub/kde/
kde http://ftp.du.se/pub/mirrors/kde/
kde ftp://ftp.du.se/pub/mirrors/kde/
kde ftp://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/
kde ftp://ftp.mirrorservice.org/sites/ftp.kde.org/pub/kde/
kde ftp://ftp.rhnet.is/pub/kde/
kde ftp://ftp.sunet.se/pub/kde/
kde ftp://ftp.tu-chemnitz.de/pub/X11/kde/
kde ftp://ftp.tuniv.szczecin.pl/pub/kde/
kde http://ftp.esat.net/mirrors/ftp.kde.org/pub/kde/
kde http://ftp.kde.org.yu/kde/
kde http://ftp.ring.gr.jp/pub/X/kde/
kde http://ftp.tuniv.szczecin.pl/pub/kde/
kde http://ftp.unina.it/pub/Linux/kde/
kde http://mi.mirror.garr.it/mirrors/KDE/
kde http://mirrors.dotsrc.org/kde/
kde ftp://ftp.duth.gr/pub/kde/
kde ftp://ftp.kde.org.yu/kde/
kde ftp://ftp.pbone.net/mirror/ftp.kde.org/pub/kde/
kde ftp://ftp.rz.uni-wuerzburg.de/pub/unix/kde/
kde ftp://ftp.unina.it/pub/Linux/kde/
kde ftp://mirrors.dotsrc.org/kde/
kde ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/kde/
kde http://ftp.duth.gr/pub/kde/
kde http://ftp.hol.gr/mirror/kde/
kde http://ftp.sunet.se/pub/kde/
kde http://ring.asahi-net.or.jp/pub/X/kde/
kde ftp://ftp.esat.net/mirrors/ftp.kde.org/pub/kde/
kde ftp://ftp.no.kde.org/pub/kde/
kde ftp://ftp.tiscali.nl/pub/mirrors/kde/
kde http://ftp.heanet.ie/mirrors/ftp.kde.org/
kde http://ftp.scarlet.be/pub/kde/
kde ftp://ftp.solnet.ch/mirror/KDE/
kde ftp://ftp.heanet.ie/mirrors/ftp.kde.org/
kde ftp://ftp.iasi.roedu.net/pub/mirrors/ftp.kde.org/
kde ftp://ftp.xcp.kiev.ua/ftp.kde.org/
kde ftp://ring.asahi-net.or.jp/pub/X/kde/
kde http://ftp.yz.yamagata-u.ac.jp/pub/X11/wm/kde/
kde ftp://ftp.scarlet.be/pub/kde/
kde ftp://sunsite.icm.edu.pl/pub/unix/kde/
kde http://www.mirrorservice.org/sites/ftp.kde.org/pub/kde/
kde ftp://ftp.hol.gr/pub/mirror/kde/
kde http://gd.tuwien.ac.at/kde/
kde ftp://ftp.ntua.gr/pub/X11/kde/
kde http://ftp.ntua.gr/pub/X11/kde/
kde ftp://ftp.fi.muni.cz/pub/kde/
kde ftp://ftp.planetmirror.com/pub/kde/
kde http://public.planetmirror.com/pub/kde/
kde ftp://ftp.yz.yamagata-u.ac.jp/pub/X11/wm/kde/
kde ftp://ftp.ring.gr.jp/pub/X/kde/
kde ftp://kde.paralax.org/kde/
kde http://ftp.kddlabs.co.jp/pub/X11/kde/
kde ftp://ftp.kddlabs.co.jp/pub/X11/kde/
kde ftp://ftp.nectec.or.th/pub/linux-softwares/KDE/
kde ftp://ftp.chg.ru/pub/kde/
kde http://ftp.chg.ru/pub/kde/
kde http://ftp.gwdg.de/pub/x11/kde/
kde ftp://gd.tuwien.ac.at/kde/
kde ftp://ftp.gwdg.de/pub/x11/kde/
kde http://gd.tuwien.ac.at/kde/
kde ftp://ftp.sayclub.com/pub/X/KDE/
kde http://ftp.sayclub.com/pub/X/KDE/
sourceforge http://heanet.dl.sourceforge.net/
sourceforge http://hivelocity.dl.sourceforge.net/
sourceforge http://garr.dl.sourceforge.net/
sourceforge http://biznetnetworks.dl.sourceforge.net/
sourceforge http://internap.dl.sourceforge.net/
sourceforge http://internode.dl.sourceforge.net/
sourceforge http://iweb.dl.sourceforge.net/
sourceforge http://jaist.dl.sourceforge.net/
sourceforge http://kent.dl.sourceforge.net/
sourceforge http://mesh.dl.sourceforge.net/
sourceforge http://nchc.dl.sourceforge.net/
sourceforge http://nfsi.dl.sourceforge.net/
sourceforge http://ovh.dl.sourceforge.net/
sourceforge http://puzzle.dl.sourceforge.net/
sourceforge http://softlayer.dl.sourceforge.net/
sourceforge http://sunet.dl.sourceforge.net/
sourceforge http://superb-east.dl.sourceforge.net/
sourceforge http://superb-west.dl.sourceforge.net/
sourceforge http://surfnet.dl.sourceforge.net/
sourceforge http://switch.dl.sourceforge.net/
sourceforge http://transact.dl.sourceforge.net/
sourceforge http://ufpr.dl.sourceforge.net/
sourceforge http://voxel.dl.sourceforge.net/
sourceforge http://waix.dl.sourceforge.net/
sourceforge http://easynews.dl.sourceforge.net/
sourceforge http://optusnet.dl.sourceforge.net/
sourceforge http://dfn.dl.sourceforge.net/
sourceforge http://freefr.dl.sourceforge.net/
xorg http://ftp.x.org/pub/
xorg http://xorg.freedesktop.org/archive/
xorg http://mirror.sg.depaul.edu/pub/x.org/
xorg http://x.paracoda.com/pub/
xorg http://x.hostingzero.com/
xfce http://mirror.netcologne.de/xfce/
xfce http://ftp.udc.es/xfce/
xfce http://www.p0llux.be/xfce/
xfce http://archive.be.xfce.org/
xfce http://archive.be2.xfce.org/
xfce http://archive.se.xfce.org/
xfce http://xfce.mirror.uber.com.au/
xfce http://mirror.yongbok.net/X11/xfce-mirror/
xfce http://archive.al-us.xfce.org/
42 changes: 42 additions & 0 deletions packages/e/eopkg/files/sandbox.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# This file contains valid path list for pisi sandbox
# and used in the build process to constrain actions.py inside
# the build directories

# Paths like /tmp allow writing to /tmp2/lala
# while /tmp/ only allows inside the /tmp directory
# ~ at the beginning of the path is replaced by pisi user's home directory

# Each package has its build directory (/var/pisi/pkgname) allowed by default
# And ccache directory is automatically added when that feature is enabled
# Any other extra path should be configured here

# Generic system paths needed by almost all programs
/tmp/
/var/tmp/
/var/run/utmp
/dev/tty
/dev/pts/
/dev/pty
/dev/null
/dev/zero
/dev/ptmx
/dev/shm/
/dev/full
/proc/
# stupid autoconf family needs /usr/lib/conftest* and /usr/lib/cf* for some conftest,
# http://sources.gentoo.org/viewcvs.py/portage/trunk/sandbox/files/sandbox/sandbox.c also permits these
/usr/lib/conftest
/usr/lib/cf
# every qt/KDE application check these
~/.qt/.qt_plugins_3.3rc.lock
~/.qt/qt_plugins_3.3rc.tmp
~/.qt/.qtrc.lock
~/.qt/.qt_designerrc.lock
/usr/qt/3/etc/settings/.qt_plugins_3.3rc.lock
/usr/qt/3/etc/settings/qt_plugins_3.3rc.tmp
/usr/qt/3/etc/settings/qt_plugins_3.3rc
/usr/qt/3/etc/settings/.qtrc.lock
/usr/qt/3/etc/settings/.qt_designerrc.lock

# FontConfig cache directory
/var/cache/fontconfig
Loading

0 comments on commit f5b5bae

Please sign in to comment.