Compare commits
6 Commits
bd29c5f855
...
3ffd3b96b3
| Author | SHA1 | Date |
|---|---|---|
fosslinux
|
3ffd3b96b3 | |
|
fosslinux
|
f4ebc241ac | |
 Andrius Štikonas
|
c63d7ae89f | |
|
fosslinux
|
b46b776404 | |
|
fosslinux
|
6f76fd2071 | |
|
fosslinux
|
d91deb50c9 |
|
|
@ -744,13 +744,6 @@ zlib 1.2.13
|
|||
zlib is a software library used for data compression and implements an abstraction of
|
||||
DEFLATE algorithm that is also used in ``gzip``.
|
||||
|
||||
xbps 0.59.1
|
||||
===========
|
||||
|
||||
XBPS is the package manager used from Void Linux. It has a rather simple package
|
||||
creation and installation system, and is much more robust than the hand-rolled
|
||||
tar package system used previously. From here, all package archives use XBPS.
|
||||
|
||||
automake 1.16.3
|
||||
===============
|
||||
|
||||
|
|
|
|||
|
|
@ -69,6 +69,8 @@ def main():
|
|||
action="store_true")
|
||||
parser.add_argument("-r", "--repo",
|
||||
help="Path to prebuilt binary packages.", nargs=None)
|
||||
parser.add_argument("--early-preseed",
|
||||
help="Skip early stages of live-bootstrap.", nargs=None)
|
||||
|
||||
# QEMU arguments
|
||||
parser.add_argument("-q", "--qemu", help="Use QEMU",
|
||||
|
|
@ -126,7 +128,8 @@ def main():
|
|||
tmpdir=args.tmpdir, external_sources=args.external_sources)
|
||||
system_b = SysB(arch=args.arch, preserve_tmp=args.preserve)
|
||||
system_a = SysA(arch=args.arch, preserve_tmp=args.preserve,
|
||||
tmpdir=args.tmpdir, external_sources=args.external_sources,
|
||||
early_preseed=args.early_preseed, tmpdir=args.tmpdir,
|
||||
external_sources=args.external_sources,
|
||||
sysb_dir=system_b.sys_dir, sysc_dir=system_c.sys_dir)
|
||||
|
||||
if args.tmpdir is not None:
|
||||
|
|
|
|||
15
sysa.py
15
sysa.py
|
|
@ -9,6 +9,7 @@
|
|||
import os
|
||||
from distutils.dir_util import copy_tree
|
||||
import shutil
|
||||
import tarfile
|
||||
|
||||
from lib.sysgeneral import SysGeneral, stage0_arch_map
|
||||
|
||||
|
|
@ -18,10 +19,12 @@ class SysA(SysGeneral):
|
|||
Class responsible for preparing sources for System A.
|
||||
"""
|
||||
# pylint: disable=too-many-instance-attributes,too-many-arguments
|
||||
def __init__(self, arch, preserve_tmp, external_sources, tmpdir, sysb_dir, sysc_dir):
|
||||
def __init__(self, arch, preserve_tmp, external_sources,
|
||||
early_preseed, tmpdir, sysb_dir, sysc_dir):
|
||||
self.git_dir = os.path.dirname(os.path.join(__file__))
|
||||
self.arch = arch
|
||||
self.preserve_tmp = preserve_tmp
|
||||
self.early_preseed = early_preseed
|
||||
|
||||
self.sys_dir = os.path.join(self.git_dir, 'sysa')
|
||||
if tmpdir is None:
|
||||
|
|
@ -46,7 +49,15 @@ class SysA(SysGeneral):
|
|||
else:
|
||||
os.mkdir(self.tmp_dir)
|
||||
|
||||
self.stage0_posix()
|
||||
if self.early_preseed:
|
||||
# Extract tar containing preseed
|
||||
with tarfile.open(self.early_preseed, "r") as seed:
|
||||
seed.extractall(self.tmp_dir)
|
||||
shutil.copy2(os.path.join(self.sys_dir, 'base-preseeded.kaem'),
|
||||
os.path.join(self.tmp_dir, 'kaem.x86'))
|
||||
else:
|
||||
self.stage0_posix()
|
||||
|
||||
self.sysa()
|
||||
|
||||
# sysb must be added to sysa as it is another initramfs stage
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@ b6e5ee431382e64b1465c5ba14d3feee847c2574b6ce3a0cb1d3d4be22457017 autoconf-2.59_
|
|||
096276278309959cea467ecc3da92f004203065f90b6f73e389d6d6757440f7c autoconf-2.61_0.tar.bz2
|
||||
d5fcce4baea5e11f983a7e4b7148545ab6720bb4e010898c73387f6711be67f4 autoconf-2.64_0.tar.bz2
|
||||
298dcf17a439adb306237b308e3c4ed3d376cb863ae0f0f08bfdf1f3199a548b autoconf-2.69_0.tar.bz2
|
||||
e074cd063e84cc1ad4a981ec807ac6c16cd821749a81ac9af1fcdb2ac1aef7e5 autoconf2.71-0_0.x86.xbps
|
||||
8c2401edf1c68910005bbcb8b8e84727a46f7d9643d2ad1267bd0259078dadc4 autoconf-2.71_0.tar.bz2
|
||||
6ff691e3ddd4f3d1796d28b07a2a96691dbd9801844c99ccbe660da59dabd74b autoconf-archive-2021.02.19_0.tar.bz2
|
||||
5b6ab1cb45dca75fa8a64e087eb7fdb47e1a3bcf9f3a136e43a05fd9ba7e1c6c autogen5.18.16-0_0.x86.xbps
|
||||
9f5da26c871827c17a9d571cefdfa8f3711717b32b2667fa871aaf5abf5efa09 autogen-5.18.16_0.tar.bz2
|
||||
fbd8739c8f69b388e2c54893faa1180cc38f2718339da82788312adb0201c5d0 automake-1.10.3_0.tar.bz2
|
||||
e5eae329b2f6854c18844df70fe13975d3c5394708e274616bc4168e55801b41 automake-1.11.2_0.tar.bz2
|
||||
732d12fdeea2c234750c8e91c90a90934d279283839cdabe0343fa765ba24168 automake-1.15.1_0.tar.bz2
|
||||
d5a2b4df3fcaf89d022bfc1517d819461fedd603b68b0f9b0f91e9967a97a676 automake1.16.3-0_0.x86.xbps
|
||||
57100612d902537b72ee2fd3dfecc903f2ea3959f1a480af87c6a1ef9a9d7c03 automake-1.16.3_0.tar.bz2
|
||||
51ef85383c0afe88c17a25f8b49c4dfdd77c1cc6aa81568ec09d45a15d580de8 automake-1.4-p6_0.tar.bz2
|
||||
8ec3af09fd23256f89b27833a8311ed347caf93d611b1209232ce104bb6fb4ef automake-1.6.3_0.tar.bz2
|
||||
031119cb14859c8bf80d5df5e0bbc475cf67f04b645dc55c80bcabe1bb31a8cd automake-1.6.3_1.tar.bz2
|
||||
|
|
@ -27,7 +27,7 @@ b2eab85c4a22060cc18945f6cb24cdf928fee370fff3fe12482e866a1cace586 automake-1.6.3
|
|||
42fe9a42c457193e7bebf31b71eb28bc71e179ed9f2c78be242a5f6b03bbbbfe automake-1.9.6_0.tar.bz2
|
||||
e180c61e3922b0546a6a3ee498abeba6dfdd404215ca850628a5277e5ede26e7 bash-5.1_0.tar.bz2
|
||||
a6190872c4daf1b55a1ad1f2fd2e34bd251f3808f750bb4a7920b66d672497a8 binutils-2.14_0.tar.bz2
|
||||
13d66cd34c8f42a97b2e27f028c2f0f409ac416c06523c6a44f9758d93dcb093 binutils2.38-0_0.x86.xbps
|
||||
de02e056b767196332b566ca3d6fb9d283872621519a2afa980c69d15178dbc7 binutils-2.38_0.tar.bz2
|
||||
e90a754c0072e3660ab209b7255868bee2e8e07611bfbdfb742697100345331d bison-2.3_0.tar.bz2
|
||||
87dae598915deabe95a4ee75ec6cfed3a6e6da1a655c3ad90ee60ec07a7d87fa bison-3.4.1_0.tar.bz2
|
||||
ae452f08ad9f7ab01f2a9bd882170e71ee6200a06f044f4aadb446cc68700016 bison-3.4.1_1.tar.bz2
|
||||
|
|
@ -49,26 +49,26 @@ f55c11b091361536774b436abe86b17f759cd7a66522cd20c7a2190da92db67a findutils-4.2.
|
|||
33afd1c66c864b486df290e682883556787c61751b8c851deb2737f0b777ffd6 flex-2.5.33_0.tar.bz2
|
||||
000147c1a33feff5c5b4cb10c2cf6c2b2f4ef92a90c9e659b25f1766a83d4afc flex-2.6.4_0.tar.bz2
|
||||
92fe0ffd0971a40fd98c70b075d5bb12f2d8093ef8fb3333aac2b532bd53a591 gawk-3.0.4_0.tar.bz2
|
||||
bcc803fc3f66db6f13222c511a12d94e4bb47f43eee903a982014fe2331ad23e gc8.0.4-0_0.x86.xbps
|
||||
2a805827b214605a82648b333fdd8bfca7a0f057671c089ff2c5bcb144aa8be6 gc-8.0.4_0.tar.bz2
|
||||
07715a0c8bc13b80fc10ede20573f92e933b8d3dc6a5c8700f4289965ea8ec74 gcc-4.0.4_0.tar.bz2
|
||||
e7c678c71c51cd6e8ce6eae029503a661169e6994ba0f988ac15634254d1fadb gcc-4.0.4_1.tar.bz2
|
||||
813969fd40cc668b1652abaf1edce83b7eb66a44159335f3decd77b839be3bd8 gcc4.7.4-0_0.x86.xbps
|
||||
63e24d076722d63243a6280d96b0a477ba6a3c58961990d88a53004d010b3da5 gettext0.21-0_0.x86.xbps
|
||||
b90cf37e7d0391dba6b1943c7527b0d5f5f9c7e399070828af6f1c39a1323883 gcc-4.7.4_0.tar.bz2
|
||||
9a299c3669367165bf1c661486bdb42297e0c4c1fc572d346b6c9e6ae186390c gettext-0.21_0.tar.bz2
|
||||
fe16fb6021f1f4650c98f77261145f37732be0aee06e957b0bdb3b01beb593a8 gmp-6.2.1_0.tar.bz2
|
||||
4d68ee6411fbcff1b66669d13fb98dd4147b7cbdaaa2b7f6285386c824be3b1e gperf3.1-0_0.x86.xbps
|
||||
3fd7b8e71183060864420479bd36a6853119c4eae5568672838cae23b7dc1050 gperf-3.1_0.tar.bz2
|
||||
390840f2bc9c2a3196c28e06f8650f408e33b5d4ffe5539e174682ed13960bc9 grep-2.4_0.tar.bz2
|
||||
7c44be8cb6dd6cb925a9cd275c39bc48fa7b5f6dfded88cd59c3f12b645230a1 grep3.7-0_0.x86.xbps
|
||||
981c898cdeb983458664681b382bfdb5f3e866b2592b7860ec9be1e5b2c5e3c6 guile3.0.7-0_0.x86.xbps
|
||||
2bf89c0140ff98c44812fd6793cc5fb7a70391394d45b1893c56650ff6f04543 grep-3.7_0.tar.bz2
|
||||
797b67539530b3dd1530275eaa932d3b473116e2ccd064e83457f38fd5537a78 guile-3.0.7_0.tar.bz2
|
||||
ec6b32cba3f49f860a3d9b97cea57931869c5849d8ca5ad0ea01dad45b9edb91 help2man-1.36.4_0.tar.bz2
|
||||
2ef01fe7252be680382bee5df890ad3f6dae26744104ccdaa2d1236bc19ab44a kbd-1.15_0.tar.bz2
|
||||
68c272b50a99e4d53cab57552337e7660020a47c06a0341efcdfa4f2441db187 kexec-tools-2.0.22_0.tar.bz2
|
||||
4c0cc86a9855122a4b5c12bff6f6bbf524495910ec718ef339fbfe7076824950 libarchive-3.5.2_0.tar.bz2
|
||||
72f3ae3066657024c266fe866d1c8f3c0b6c70e0074f560349df432b68132523 libatomic_ops7.6.10-0_0.x86.xbps
|
||||
2054d608a2fe387c754333d9c945615e0d310843b9983efe5b33655b55f0d507 libffi3.3-0_0.x86.xbps
|
||||
ff6a9f179d44c0112e080150e36ba51e93a2ac4146a707f4c18bae5d1d78f960 libatomic_ops-7.6.10_0.tar.bz2
|
||||
09e3cd965c2cd826f5f4bb315b9eb8479c4f820812ca99bdc623b0c9b9ffc288 libffi-3.3_0.tar.bz2
|
||||
5001f8fdbba0db0ecf60263bfea97ed4b9174d06a447e98bee220548f973756a libtool-1.4_0.tar.bz2
|
||||
94d0f9d2f8fbc2b00fe4c0f479e5590fa70b7d856f0a643ad006787d963f99ee libtool-2.2.4_0.tar.bz2
|
||||
374214711d42681d030d6faceba3198243ec22301d94212f7162bd4873b7ba27 libtool-2.4.7_0.tar.bz2
|
||||
21a5d5d8b993b8455b33624471687f6757f08c6da66d4fc73dc42e13bba57d8d libunistring0.9.10-0_0.x86.xbps
|
||||
2e92ba350a5b4c67cfe6678d1ac5f430bc387ac5172757f11a6e50e794ff4068 libunistring-0.9.10_0.tar.bz2
|
||||
1d07aaf7049be45853fd409340cdb52bb3a1b6dfa4dbc8b69358c1ee966cd67f linux-4.9.10_0.tar.bz2
|
||||
61507b58074a3742191b606f9415f79406e5daa693ab4ba4a4543897696628ea linux-headers-5.10.41_0.tar.bz2
|
||||
5cda10550198e613c426e45c5fffe0f7e8761296e7339e9e9a1f9da995b4865a m4-1.4.7_0.tar.bz2
|
||||
|
|
@ -79,10 +79,10 @@ ffeadd2b9d9e72edb5b15750b50a6c0c47bb90a1cb14ba66732aa733e0209e50 mpfr-4.1.0_0.t
|
|||
c8e2bdfd5e7a9f30c313511fdd3786d12add252b9e30154c28c079455af25cf5 musl-1.1.24_0.tar.bz2
|
||||
7f3251ee05aaa38e9803db41104acbfa399873a31591411c3580d181a6461d0c musl-1.1.24_1.tar.bz2
|
||||
9f3d2b47634860cfd5f03fa3346ef9a60a6dab57164ee974578dbb7f4a45e16b musl-1.1.24_2.tar.bz2
|
||||
4b0aab8540e9acc3bd2cab11825130b3ff010825ec7a2b992cd8b9a558703e1f musl1.2.3-0_1.x86.xbps
|
||||
af949ecc98bdc3b94d0f74e5d38a3c3710712a029ddb6cf9b801390e1d626b3c musl-1.2.3_0.tar.bz2
|
||||
54000d3685babc5627c580ccfd36c05006b91ca2da21a2d92f362b47c145ddee musl-1.2.3_1.tar.bz2
|
||||
df12820e27abfe07c4c27bb2f9abf2e0758b797d5d3036e29d6c57cfb5aa12d6 openssl-1.1.1l_0.tar.bz2
|
||||
f58c4bb937d0220b29819a97a8368e7c23fb882d86ab929498ad479aaab21058 patch2.7.6-0_0.x86.xbps
|
||||
0f59d97601d204b8273255b4dea8891464c88fcb9e908af799923ccdb934b7fc patch-2.7.6_0.tar.bz2
|
||||
75fffc4bb14f14281bc1853455888d1d818b7027efc1e4014af1a755771a64e8 perl-5.000_0.tar.bz2
|
||||
3a709c914e7d01f5bfd12d8d859ac7135d9ac57528cb2e325448f91cfb4869b8 perl-5.003_0.tar.bz2
|
||||
23ea39db272dcbbeedf2ea6e758052228b0a764be462c0562339b58ae472d83d perl5.004-05_0.tar.bz2
|
||||
|
|
@ -92,15 +92,14 @@ f58c4bb937d0220b29819a97a8368e7c23fb882d86ab929498ad479aaab21058 patch2.7.6-0_0
|
|||
9ceb09af82397f98e99e339cb4fd3abd9f61d222ea7e6a0920e2f3a7c316c70a perl-5.6.2_0.tar.bz2
|
||||
c69e0197ebc1bf9f9fc68a06d4c649c934784077058c24a484da59a153132816 pkg-config-0.29.2_0.tar.bz2
|
||||
8a0248fbf8fe1764580698415cc3628585d4dd054ddf63040f400e18cbaef7a4 sed-4.0.9_0.tar.bz2
|
||||
b4aec2c2b107562c0d1e173259ad8c4484d1ebedb9ee24faa33a2159bdfd04b6 sed4.8-0_0.x86.xbps
|
||||
177553732a080e25ba5778525743543e9da012122f4ad0d314a425ca87a3c2bd sed-4.8_0.tar.bz2
|
||||
1245905d8942a10cccf21850a521db19c9a65ab35cef4c6bbb72672773851048 tar-1.34_0.tar.bz2
|
||||
5e7fdb405574717e3759144fab500954817ab8852d2da6111d43cb9fe77f01ac tcc-0.9.27_0.tar.bz2
|
||||
42b8eabbd299737541b57b3aa362eeeb20499449901fc2a4895302ce0117080c tcc-0.9.27_1.tar.bz2
|
||||
db57c6ef39965f0562d2aefe3c06571df50ba1265446d97f2714d80518862cef tcc-0.9.27_2.tar.bz2
|
||||
e2014b844b1a79cda9142a38af0404efd242ae02f77aa286c968e4ad6ad87265 tcc-0.9.27_3.tar.bz2
|
||||
3a9ee359fe490d64225f14cddeb749dda1a24a1bb39bbc7300336b2fe4419538 texinfo6.7-0_0.x86.xbps
|
||||
0c8b02693dac9483d845e7754919fdf21e97d695e5de13893c1356d0a9c22946 texinfo-6.7_0.tar.bz2
|
||||
bf4a6be34cda165e4c206e852ccc09387f5ae8ea7db6de2db01297cabfa1a486 util-linux-2.19.1_0.tar.bz2
|
||||
c091eb91d33ef7b7747800ee3758337f3ef9334f83e294dcddb0e492f7ea6ecf which2.21-0_0.x86.xbps
|
||||
9f96a5934415df5d1a7caca098d01fb51e265099daadcb876e18e9c99ec6ce7e xbps-0.59.1_0.tar.bz2
|
||||
284d176b39312795bf155b794fc3c02070ff788d19307e926429fa3299faf283 which-2.21_0.tar.bz2
|
||||
e900a8b70f49bfcbb7a48bd27e2de67c30454d693b6f35dcdfadd35570e98e69 xz-5.0.5_0.tar.bz2
|
||||
068fcf87574883b29734bda3ccc45ef0e2be7aa6fb7e86941c78eb5a4de61389 zlib-1.2.13_0.tar.bz2
|
||||
|
|
|
|||
|
|
@ -0,0 +1,25 @@
|
|||
#!/bin/sh
|
||||
|
||||
# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
|
||||
# SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com>
|
||||
# SPDX-FileCopyrightText: 2020-2022 fosslinux <fosslinux@aussies.space>
|
||||
# SPDX-FileCopyrightText: 2022 Dor Askayo <dor.askayo@gmail.com>
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
set -ex
|
||||
|
||||
# Set commonly used variables
|
||||
sysa=/sysa
|
||||
distfiles=/sysa/distfiles
|
||||
prefix=/usr
|
||||
bindir=${prefix}/bin
|
||||
libdir=${libdir}/mes
|
||||
incdir=${prefix}/include
|
||||
srcdir=${prefix}/src
|
||||
TMPDIR=/tmp # tmpdir is needed for patch to work
|
||||
PATH=${bindir}
|
||||
|
||||
cd ${sysa}
|
||||
|
||||
exec bash run.sh
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
#!/bin/sh
|
||||
|
||||
# SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
/usr/bin/kaem -f /sysa/after-preseeded.kaem
|
||||
|
|
@ -77,15 +77,7 @@ get_revision() {
|
|||
local pkg=$1
|
||||
cd "${SRCDIR}/repo"
|
||||
# Get revision (n time this package has been built)
|
||||
revision="$(echo "${pkg}"*)"
|
||||
# Different versions of bash
|
||||
if [ "${revision}" = "${pkg}*" ] || [ -z "${revision}" ]; then
|
||||
revision=0
|
||||
else
|
||||
revision="${revision##*_}"
|
||||
revision="${revision%%.*}"
|
||||
revision=$((++revision))
|
||||
fi
|
||||
revision=$( (ls -1 "${pkg}"* 2>/dev/null || true) | wc -l | sed 's/ *//g')
|
||||
}
|
||||
|
||||
# Installs binary packages from an earlier run
|
||||
|
|
@ -96,9 +88,7 @@ bin_preseed() {
|
|||
cd "${SRCDIR}/repo-preseeded"
|
||||
if [ "${UPDATE_CHECKSUMS}" = "True" ] || src_checksum "${pkg}" $((revision)); then
|
||||
echo "${pkg}: installing prebuilt package."
|
||||
mv "${pkg}_${revision}"* ../repo || \
|
||||
mv "${pkg%-*}${pkg##*-}-0_${revision}"* ../repo || \
|
||||
return 1
|
||||
mv "${pkg}_${revision}"* ../repo || return 1
|
||||
if [[ "${pkg}" == bash-* ]]; then
|
||||
# tar does not like overwriting running bash
|
||||
# shellcheck disable=SC2153
|
||||
|
|
@ -243,7 +233,7 @@ extract_file() {
|
|||
;;
|
||||
*)
|
||||
case "${f}" in
|
||||
*.tar*)
|
||||
*.tar* | *.tgz)
|
||||
if test -e "${PREFIX}/libexec/rmt"; then
|
||||
# Again, we want to split out into words.
|
||||
# shellcheck disable=SC2086
|
||||
|
|
@ -329,7 +319,10 @@ default_src_install() {
|
|||
make -f Makefile install PREFIX="${PREFIX}" DESTDIR="${DESTDIR}"
|
||||
}
|
||||
|
||||
create_tarball_pkg() {
|
||||
src_pkg() {
|
||||
touch -t 197001010000.00 .
|
||||
reset_timestamp
|
||||
|
||||
# If grep is unavailable, then tar --sort is unavailable.
|
||||
# So this does not need a command -v grep.
|
||||
tar_basename="${pkg}_${revision}.tar"
|
||||
|
|
@ -362,19 +355,6 @@ create_tarball_pkg() {
|
|||
bzip2 --best "${tar_basename}"
|
||||
}
|
||||
|
||||
src_pkg() {
|
||||
touch -t 197001010000.00 .
|
||||
reset_timestamp
|
||||
if command -v xbps-create >/dev/null 2>&1; then
|
||||
cd /usr/src/repo
|
||||
xbps-create -A "${ARCH}" -n "${pkg%-*}${pkg##*-}-0_${revision}" -s "${pkg}" --compression xz "${DESTDIR}"
|
||||
echo "${pkg}: adding package to repository."
|
||||
xbps-rindex --compression xz -a "/usr/src/repo/${pkg%-*}${pkg##*-}-0_${revision}.${ARCH}.xbps"
|
||||
else
|
||||
create_tarball_pkg
|
||||
fi
|
||||
}
|
||||
|
||||
src_checksum() {
|
||||
local pkg=$1 revision=$2
|
||||
local rval=0
|
||||
|
|
@ -382,8 +362,6 @@ src_checksum() {
|
|||
# We avoid using pipes as that is not supported by initial sha256sum from mescc-tools-extra
|
||||
local checksum_file=/tmp/checksum
|
||||
_grep "${pkg}_${revision}" "${SOURCES}/SHA256SUMS.pkgs" > "${checksum_file}" || true
|
||||
# XBPS style;
|
||||
_grep "${pkg%-*}${pkg##*-}-0_${revision}" "${SOURCES}/SHA256SUMS.pkgs" >> "${checksum_file}" || true
|
||||
# Check there is something in checksum_file
|
||||
if ! [ -s "${checksum_file}" ]; then
|
||||
echo "${pkg}: no checksum stored!"
|
||||
|
|
@ -398,15 +376,6 @@ src_checksum() {
|
|||
|
||||
src_apply() {
|
||||
local pkg="${1}" revision="${2}"
|
||||
if command -v xbps-install >/dev/null 2>&1; then
|
||||
xbps-install -y -R /usr/src/repo "${pkg%-*}${pkg##*-}"
|
||||
else
|
||||
src_apply_tar "${pkg}" "${revision}"
|
||||
fi
|
||||
}
|
||||
|
||||
src_apply_tar() {
|
||||
local pkg=$1 revision=$2
|
||||
# Overwriting files is mega busted, so do it manually
|
||||
# shellcheck disable=SC2162
|
||||
if [ -e /tmp/filelist.txt ]; then
|
||||
|
|
|
|||
|
|
@ -50,7 +50,6 @@ cp x86_defs.M1 lib/m2/x86/x86_defs.M1
|
|||
rm x86_defs.M1
|
||||
|
||||
# Build mes-m2
|
||||
mkdir bin m2
|
||||
kaem --verbose --strict --file kaem.run
|
||||
cp bin/mes-m2 ${bindir}/mes-m2
|
||||
chmod 755 ${bindir}/mes-m2
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ echo "Installing packages into sysb"
|
|||
|
||||
install_tar() {
|
||||
echo "${1}: installing package"
|
||||
src_apply_tar "$@"
|
||||
src_apply "$@"
|
||||
}
|
||||
|
||||
# Install needed packages.
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ echo "Installing packages into sysc"
|
|||
|
||||
install_tar() {
|
||||
echo "${1}: installing package"
|
||||
src_apply_tar "$@"
|
||||
src_apply "$@"
|
||||
}
|
||||
|
||||
# Install packages.
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
|
||||
|
||||
SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
|
@ -67,9 +67,6 @@ build curl-7.83.0
|
|||
|
||||
build zlib-1.2.13
|
||||
|
||||
build xbps-0.59.1
|
||||
export XBPS_TARGET_ARCH="${ARCH}"
|
||||
|
||||
build automake-1.16.3
|
||||
|
||||
build autoconf-2.71
|
||||
|
|
@ -126,4 +123,4 @@ if [ -e after.sh ]; then
|
|||
FILE=after.sh
|
||||
fi
|
||||
|
||||
exec env -i PATH="${PATH}" PREFIX="${PREFIX}" SOURCES="${SOURCES}" DESTDIR="${DESTDIR}" DISTFILES="${DISTFILES}" HOME="${HOME}" SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH}" bash ${FILE}
|
||||
exec env -i PATH="${PATH}" PREFIX="${PREFIX}" SOURCES="${SOURCES}" DESTDIR="${DESTDIR}" DISTFILES="${DISTFILES}" HOME="${HOME}" SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH}" bash "${FILE}"
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
|
||||
|
||||
SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
Do not use CC argument Wno-unused-command-line-argument.
|
||||
Unsupported in GCC 4.
|
||||
|
||||
--- mk/prog.mk 2021-12-18 21:32:27.025764282 +1100
|
||||
+++ mk/prog.mk 2021-12-18 21:32:06.909579026 +1100
|
||||
@@ -10,8 +10,6 @@
|
||||
BINS += $(BIN).static
|
||||
endif
|
||||
|
||||
-CFLAGS += -Wno-unused-command-line-argument
|
||||
-
|
||||
.PHONY: all
|
||||
all: $(BINS)
|
||||
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
|
||||
|
||||
SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
Do not build or install shared binaries.
|
||||
Additionally, install static binaries with normal names.
|
||||
|
||||
--- mk/prog.mk 2021-12-18 21:39:55.589895753 +1100
|
||||
+++ mk/prog.mk 2021-12-18 21:45:08.260778227 +1100
|
||||
@@ -21,9 +21,8 @@
|
||||
.PHONY: install
|
||||
install: all
|
||||
install -d $(DESTDIR)$(SBINDIR)
|
||||
- install -m 755 $(BIN) $(DESTDIR)$(SBINDIR)
|
||||
ifdef BUILD_STATIC
|
||||
- install -m 755 $(BIN).static $(DESTDIR)$(SBINDIR)
|
||||
+ install -m 755 $(BIN).static $(DESTDIR)$(SBINDIR)/$(BIN)
|
||||
endif
|
||||
ifdef MAN
|
||||
install -d $(DESTDIR)$(MANDIR)/man$(MANSECTION)
|
||||
@@ -49,9 +48,5 @@
|
||||
${SILENT}$(CC) -static $(OBJS) $(CPPFLAGS) -L$(TOPDIR)/lib \
|
||||
$(CFLAGS) $(LDFLAGS) $(PROG_LDFLAGS) $(STATIC_LIBS) -o $@
|
||||
|
||||
-$(BIN): $(OBJS) $(TOPDIR)/lib/libxbps.so
|
||||
- @printf " [CCLD]\t\t$@\n"
|
||||
- ${SILENT}$(CC) $^ $(CPPFLAGS) -L$(TOPDIR)/lib \
|
||||
- $(CFLAGS) $(PROG_CFLAGS) $(LDFLAGS) $(PROG_LDFLAGS) \
|
||||
- -lxbps -o $@
|
||||
-
|
||||
+$(BIN):
|
||||
+.PHONY = $(BIN)
|
||||
|
|
@ -1 +0,0 @@
|
|||
https://github.com/void-linux/xbps/archive/refs/tags/0.59.1.tar.gz 0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
# TODO: add mechanism to change output filename to something nicer
|
||||
|
||||
src_configure() {
|
||||
PKG_CONFIG_PATH="${PREFIX}/lib/musl/pkgconfig" \
|
||||
./configure --prefix="${PREFIX}" \
|
||||
--libdir="${PREFIX}/lib/musl" \
|
||||
--pkgconfigdir="${PREFIX}/lib/musl/pkgconfig" \
|
||||
--enable-rpath \
|
||||
--enable-static
|
||||
echo "CFLAGS += -Wno-error" >> config.mk
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
rm "${DESTDIR}${PREFIX}/lib/musl/libxbps.so"*
|
||||
rm -r "${DESTDIR}${PREFIX}/share/bash-completion/completions"
|
||||
}
|
||||
Loading…
Reference in New Issue