Commit 32ddfc25 authored by Firas Khalil Khana's avatar Firas Khalil Khana 🐧

Minor fixes

parent 574d9a4a
......@@ -31,9 +31,6 @@
[submodule "cerata/harfbuzz/harfbuzz"]
path = cerata/harfbuzz/harfbuzz
url = https://github.com/harfbuzz/harfbuzz
[submodule "cerata/iproute2/iproute2"]
path = cerata/iproute2/iproute2
url = https://git.kernel.org/pub/scm/network/iproute2/iproute2
[submodule "cerata/jemalloc/jemalloc"]
path = cerata/jemalloc/jemalloc
url = https://github.com/jemalloc/jemalloc
......
......@@ -9,9 +9,6 @@ prepare_system() {
}
configure_system() {
sed '9327s/mv/cp/' \
-i Makefile.in
./configure \
--prefix=/usr \
--disable-nls
......
......@@ -5,6 +5,6 @@
nom=diffutils
ver=3.7
url=https://ftp.sotirov-bg.net/pub/mirrors/gnu/$nom/$nom-$ver.tar.xz
url=https://ftpmirror.gnu.org/$nom/$nom-$ver.tar.xz
sum=7b12cf8aea1b9844773748f72272d9c6a38adae9c3c3a8c62048f91fb56c60b76035fa5f51665dceaf2cfbf1d1f4a3efdcc24bf47a5a16ff4350543314b12c9c
lic='GPL-3.0-only GPL-3.0-or-later'
......@@ -4,7 +4,7 @@
# Voyager: Firas Khalil Khana (firasuke) <firasuke@gmail.com>
nom=file
ver=5.37
url=ftp://ftp.astron.com/pub/$nom/$nom-$ver.tar.gz
sum=bf153c15aebdd00329806231d20f295077b8b99efd0181d01279bcf3734a1718567df38cf75bc929eb8015ac98d29bb4bf1228d7ece8bfdfe14dd976391dd06d
ver=5.38
url=https://astron.com/pub/$nom/$nom-$ver.tar.gz
sum=9eeeba69cbc9f0c00a0bdf9eaf60c73a4a709e797068f109d85c1ef2a19c8b0e012ecd73714f03cbb1770dfa717e8a661ad746b644cc030cafbfb1f7aac35a40
lic=BSD-2-Clause
......@@ -21,7 +21,7 @@ prepare_cross() {
#define STANDARD_STARTFILE_PREFIX_1 \"$TOOL/lib/\"
#undef STANDARD_STARTFILE_PREFIX_2
#define STANDARD_STARTFILE_PREFIX_2 \"\"" >> $file
#define STANDARD_STARTFILE_PREFIX_2 \"\"\n" >> $file
done
sed '/m64/s/lib64/lib/' \
......
......@@ -22,7 +22,7 @@ prepare_native() {
#define STANDARD_STARTFILE_PREFIX_1 \"$TOOL/lib/\"
#undef STANDARD_STARTFILE_PREFIX_2
#define STANDARD_STARTFILE_PREFIX_2 \"\"" >> $file
#define STANDARD_STARTFILE_PREFIX_2 \"\"\n" >> $file
done
sed '/m64/s/lib64/lib/' \
......
......@@ -12,12 +12,12 @@ prepare_system() {
sed "s/\/lib/\/usr&/" \
-i $file
echo "
printf '
#undef STANDARD_STARTFILE_PREFIX_1
#define STANDARD_STARTFILE_PREFIX_1 \"/usr/lib/\"
#undef STANDARD_STARTFILE_PREFIX_2
#define STANDARD_STARTFILE_PREFIX_2 \"\"" >> $file
#define STANDARD_STARTFILE_PREFIX_2 \"\"\n' >> $file
done
sed '/m64/s/lib64/lib/' \
......
# gettext-tiny
## configure
yes the prefix is in small letters and no spaces used
......@@ -4,6 +4,7 @@
# Voyager: Firas Khalil Khana (firasuke) <firasuke@gmail.com>
nom=gettext-tiny
ver=git
url=https://github.com/sabotage-linux/$nom
ver=0.3.1
url=http://ftp.barfooze.de/pub/sabotage/tarballs/$nom-$ver.tar.xz
sum=a2d88d3d0989a2f775d7940c28470f4cb80e41f190b69c65f61890764c73f96810006320e9daaf717e9fccd93eb541ca0c818bd58b2180713e030ad788263060
lic=MIT
......@@ -4,19 +4,17 @@
# Voyager: Firas Khalil Khana (firasuke) <firasuke@gmail.com>
prepare_chroot() {
rsync -vah $SRCD/$nom $CSRC --delete
rsync -vah $SRCD/$nom/$nom-$ver/ $CSRC/$nom --delete
cd $CSRC/$nom
}
configure_chroot() {
cat > config.mak << EOF
prefix=$TOOL
printf 'prefix=$TOOL
LIBINTL=MUSL
AR=$AR
RANLIB=$RANLIB
CFLAGS=$CFLAGS
LDFLAGS=$LDFLAGS
EOF
LDFLAGS=$LDFLAGS' > config.mak
}
build_chroot() {
......
......@@ -4,19 +4,17 @@
# Voyager: Firas Khalil Khana (firasuke) <firasuke@gmail.com>
prepare_system() {
rsync -vah $SRCD/$nom $SSRC --delete
rsync -vah $SRCD/$nom/$nom-$ver/ $SSRC/$nom --delete
cd $SSRC/$nom
}
configure_system() {
cat > config.mak << EOF
prefix=/usr
printf 'prefix=/usr
LIBINTL=MUSL
AR=$AR
RANLIB=$RANLIB
CFLAGS=$CFLAGS
LDFLAGS=$LDFLAGS
EOF
LDFLAGS=$LDFLAGS' > config.mak
}
build_system() {
......
# Copyright (c) 2019, Firas Khalil Khana
# Distributed under the terms of the ISC License
# Voyager: Firas Khalil Khana (firasuke) <firasuke@gmail.com>
nom=iproute2
ver=git
url=https://$ver.kernel.org/pub/scm/network/$nom/$nom
lic=GPLv2+
prepare_system() {
rsync -vah $CERD/$nom/$nom $SSRC --delete
cd $SSRC/$nom
rm -frv include/ip6tables.h include/iptables include/iptables.h \
include/libiptc include/netinet man/man8/arpd.8
}
configure_system() {
sed -e '/ARPD/d' \
-e "s/CC := gcc/CC = $TUPL-gcc --sysroot=\/home\/glaucus\/system/" \
-e "s/HOSTCC ?= .*/HOSTCC = $TUPL-gcc --sysroot=\/home\/glaucus\/system/" \
-e "s/CCOPTS = -O2/CCOPTS = $CFLAGS/" \
-e 's/SUBDIRS=.*/SUBDIRS=lib ip/' \
-e '/genl/d' \
-i Makefile
sed 's/TCPI_OPT_ECN_SEEN/16/' \
-i misc/ss.c
sed 's/.m_ipt.o//' \
-i tc/Makefile
./configure
sed -e '/IPSET/i TC_CONFIG_NO_XT:=y' \
-e 's/TC_CONFIG_IPSET:=y/TC_CONFIG_IPSET:=n/g' \
-e '/IPSET/{n;d}' \
-e 's/IP_CONFIG_SETNS:=y/IP_CONFIG_SETNS:=n/g' \
-e 's/HAVE_ELF:=y/HAVE_ELF:=n/g' \
-e '/HAVE_ELF/{n;N;d}' \
-e 's/HAVE_MNL:=y/HAVE_MNL:=n/g' \
-e '/HAVE_MNL/{n;N;d}' \
-e 's/HAVE_CAP:=y/HAVE_CAP:=n/g' \
-e '/HAVE_CAP/{n;N;d}' \
-i config.mk
}
build_system() {
make
}
install_system() {
install -Dv ip/ip $SCER/$nom/sac/usr/bin/ip
install -Dv man/man8/ip.8 $SCER/$nom/sac/usr/share/man/man8/ip.8
}
iproute2 @ 9eee92a4
Subproject commit 9eee92a41ae630b2c9e92ae2875ca56801c96b73
# Copyright (c) 2019, Firas Khalil Khana
# Distributed under the terms of the ISC License
# Voyager: Firas Khalil Khana (firasuke) <firasuke@gmail.com>
prepare_system() {
rsync -vah $CERD/$nom/$nom $SSRC --delete
cd $SSRC/$nom
rm -frv include/ip6tables.h include/iptables include/iptables.h \
include/libiptc include/netinet man/man8/arpd.8
}
configure_system() {
sed -e '/ARPD/d' \
-e "s/CC := gcc/CC = $TUPL-gcc --sysroot=\/home\/glaucus\/system/" \
-e "s/HOSTCC ?= .*/HOSTCC = $TUPL-gcc --sysroot=\/home\/glaucus\/system/" \
-e "s/CCOPTS = -O2/CCOPTS = $CFLAGS/" \
-e 's/SUBDIRS=.*/SUBDIRS=lib ip/' \
-e '/genl/d' \
-i Makefile
sed 's/TCPI_OPT_ECN_SEEN/16/' \
-i misc/ss.c
sed 's/.m_ipt.o//' \
-i tc/Makefile
./configure
sed -e '/IPSET/i TC_CONFIG_NO_XT:=y' \
-e 's/TC_CONFIG_IPSET:=y/TC_CONFIG_IPSET:=n/g' \
-e '/IPSET/{n;d}' \
-e 's/IP_CONFIG_SETNS:=y/IP_CONFIG_SETNS:=n/g' \
-e 's/HAVE_ELF:=y/HAVE_ELF:=n/g' \
-e '/HAVE_ELF/{n;N;d}' \
-e 's/HAVE_MNL:=y/HAVE_MNL:=n/g' \
-e '/HAVE_MNL/{n;N;d}' \
-e 's/HAVE_CAP:=y/HAVE_CAP:=n/g' \
-e '/HAVE_CAP/{n;N;d}' \
-i config.mk
}
build_system() {
make
}
install_system() {
install -Dv ip/ip $SCER/$nom/sac/usr/bin/ip
install -Dv man/man8/ip.8 $SCER/$nom/sac/usr/share/man/man8/ip.8
}
# Copyright (c) 2019, Firas Khalil Khana
# Distributed under the terms of the ISC License
# Voyager: Firas Khalil Khana (firasuke) <firasuke@gmail.com>
nom=iputils
ver=20190709
url=https://github.com/$nom/$nom/archive/s$ver.tar.gz
sum=5db18ac49fa46ed810da4d508e78f4baf2d5c07e7f923eb49d005ad8745743d8861e5788b34a7e37fb7261cee7ddfb768b737eee9d200502ea53537142cac6b5
lic='BSD-3-Clause GPL-2.0-or-later'
# Copyright (c) 2019, Firas Khalil Khana
# Distributed under the terms of the ISC License
# Voyager: Firas Khalil Khana (firasuke) <firasuke@gmail.com>
prepare_system() {
rsync -vah $SRCD/$nom/$nom-$ver/ $SSRC/$nom --delete
cd $SSRC/$nom
}
configure_system() {
./configure \
--prefix=/usr \
--disable-nls
}
build_system() {
make
}
install_system() {
make \
DESTDIR=$SCER/$nom/sac \
install-strip
}
......@@ -2,3 +2,5 @@
## Install
Need to copy the man directory when building remotely
url has no $ver so it requires constant checking for updates
......@@ -33,8 +33,8 @@ install_system() {
ln -fsv ../lib/ld-$nom-$ARCH.so.1 /usr/bin/ldd
echo /usr/lib > /etc/ld-$nom-$ARCH.path
printf '/usr/lib\n' > /etc/ld-$nom-$ARCH.path
echo '#!/usr/bin/true' > /usr/bin/ldconfig
printf '#!/usr/bin/true\n' > /usr/bin/ldconfig
chmod +x /usr/bin/ldconfig
}
......@@ -5,6 +5,6 @@
nom=netbsd-curses
ver=0.3.1
url=https://github.com/sabotage-linux/$nom/archive/v$ver.tar.gz
sum=bde5b08b8e7aad7b1d16bf154606e5c5b267e9e19ac1f13f28ba9d01de86d1dfe2e7fc87be28ff64e7d650c7881f35120834016c2b2563c0f69c8b7e7ea583d9
url=http://ftp.barfooze.de/pub/sabotage/tarballs/$nom-$ver.tar.xz
sum=bd65358b59299de6b9879022842c7cd4fcdc1449b6bf7db5870a5fe0ffcc873f68da2bcf6b27bc231a956797377d66f56177178dad14304f332aaf924482ca90
lic='BSD-2-Clause BSD-3-Clause'
......@@ -9,11 +9,9 @@ prepare_chroot() {
}
configure_chroot() {
cat > config.mak << EOF
PREFIX = $TOOL
printf 'PREFIX = $TOOL
AR = $AR
RANLIB = $RANLIB
EOF
RANLIB = $RANLIB' > config.mak
sed 's/-O0 //' \
-i GNUmakefile
......
......@@ -9,11 +9,9 @@ prepare_system() {
}
configure_system() {
cat > config.mak << EOF
PREFIX = /usr
printf 'PREFIX = /usr
AR = $AR
RANLIB = $RANLIB
EOF
RANLIB = $RANLIB' > config.mak
sed 's/-O0 //' \
-i GNUmakefile
......
......@@ -4,6 +4,7 @@
# Voyager: Firas Khalil Khana (firasuke) <firasuke@gmail.com>
nom=oksh
ver=git
url=https://github.com/ibara/$nom
ver=6.6
url=https://github.com/ibara/$nom/releases/download/$nom-$ver/$nom-$ver.tar.gz
sum=9a7582cb8ecbb4821ae46526666ceee1dd17522a86f74bc1dd8846f4684db0a256d87f1bd92b79c3e8c5b320c621307f493bcbabe03beae63499e92097404759
lic=Unlicense
......@@ -4,7 +4,7 @@
# Voyager: Firas Khalil Khana (firasuke) <firasuke@gmail.com>
prepare_chroot() {
rsync -vah $SRCD/$nom $CSRC --delete
rsync -vah $SRCD/$nom/$nom-$ver/ $CSRC/$nom --delete
cd $CSRC/$nom
}
......
......@@ -4,7 +4,7 @@
# Voyager: Firas Khalil Khana (firasuke) <firasuke@gmail.com>
prepare_system() {
rsync -vah $SRCD/$nom $SSRC --delete
rsync -vah $SRCD/$nom/$nom-$ver/ $SSRC/$nom --delete
cd $SSRC/$nom
}
......
......@@ -24,5 +24,7 @@ build_chroot() {
install_chroot() {
rsync -vah $nom $TOOL/bin
for i in $(./$nom); do ln -fsv $nom $TOOL/bin/$i; done
for u in $(./$nom); do
ln -fsv $nom $TOOL/bin/$u
done
}
......@@ -26,5 +26,7 @@ install_system() {
rsync -vah $nom $SCER/$nom/sac/usr/bin
for i in $(./$nom); do ln -fsv $nom $SCER/$nom/sac/usr/bin/$i; done
for u in $(./$nom); do
ln -fsv $nom $SCER/$nom/sac/usr/bin/$u
done
}
......@@ -4,15 +4,12 @@
# Voyager: Firas Khalil Khana (firasuke) <firasuke@gmail.com>
prepare_chroot() {
rsync -vah $SRCD/$nom $CSRC --delete
cd $CSRC/$nom
install -dv $CBLD/$nom
cd $CBLD/$nom
}
configure_chroot() {
sed 's/bash/dash/' \
-i configure
./configure \
$SRCD/$nom/configure \
--prefix=$TOOL \
--zlib-compat
}
......
......@@ -4,15 +4,12 @@
# Voyager: Firas Khalil Khana (firasuke) <firasuke@gmail.com>
prepare_system() {
rsync -vah $SRCD/$nom $SSRC --delete
cd $SSRC/$nom
install -dv $SBLD/$nom
cd $SBLD/$nom
}
configure_system() {
sed 's/bash/dash/' \
-i configure
./configure \
$SRCD/$nom/configure \
--prefix=/usr \
--zlib-compat
}
......
# Copyright (c) 2019, Firas Khalil Khana
# Distributed under the terms of the ISC License
rsync -vah $TOOL/ $GLAD/backup/chroot --delete
sudo rsync -vah $TOOL/ $GLAD/backup/chroot --delete
......@@ -19,6 +19,7 @@ $SCRD/check zlib-ng
$SCRD/check pigz
$SCRD/check make
$SCRD/check patch
$SCRD/check perl-cross
$SCRD/check perl
$SCRD/check sed
$SCRD/check xz
......
......@@ -5,7 +5,7 @@ sudo \
chroot $GLAD \
$TOOL/bin/env -i \
HOME=/root \
PATH=/bin:/usr/bin:$TOOL/bin:$TOOL/usr/bin \
PATH=/bin:/usr/bin:$TOOL/bin \
TERM=xterm-256color \
PS1="[\033[0;44mglaucus\033[0m:\033[1m\w\033[0m]$ " \
ksh
......@@ -4,6 +4,6 @@
find $TOOL -name \*.la -delete
strip -gv $TOOL/lib/*
/usr/bin/strip --strip-unneeded -v $TOOL/bin/* $TOOL/usr/bin/*
/usr/bin/strip --strip-unneeded -v $TOOL/bin/*
rm -frv $TOOL/share/doc $TOOL/share/info $TOOL/share/man
......@@ -6,10 +6,10 @@ construct() {
. $CERD/$ceras/ceras
. $CERD/$nom/chroot.ceras
prepare_chroot || { echo chroot $nom prepare failed; exit $?; }
configure_chroot || { echo chroot $nom configure failed; exit $?; }
build_chroot || { echo chroot $nom build failed; exit $?; }
install_chroot || { echo chroot $nom install failed; exit $?; }
prepare_chroot || { printf chroot $nom prepare failed; exit $?; }
configure_chroot || { printf chroot $nom configure failed; exit $?; }
build_chroot || { printf chroot $nom build failed; exit $?; }
install_chroot || { printf chroot $nom install failed; exit $?; }
done
}
......
......@@ -3,5 +3,5 @@
rsync -vah $GLAD/backup/toolchain/ $TOOL --delete
/usr/bin/rm -frv $CBLD
rm -frv $CBLD
install -dv $CBLD
......@@ -19,9 +19,9 @@ export GLAT=$GLAD/toolchain
export TOOL=/toolchain
export PATH=$TOOL/bin:$TOOL/usr/bin:/usr/bin:/usr/bin/core_perl
export PATH=$TOOL/bin:/usr/bin:/usr/bin/core_perl
export MAKEFLAGS=-j12
export MAKEFLAGS=-j1
export AR=gcc-ar
export NM=gcc-nm
......
#!/usr/bin/dash -e
/usr/bin/git submodule foreach git pull
git submodule foreach git pull
......@@ -36,6 +36,8 @@ $SCRD/check meson
$SCRD/check grub
$SCRD/check pcre2
$SCRD/check less
$SCRD/check iputils
$SCRD/check iproute2
$SCRD/check kbd
$SCRD/check mandoc
$SCRD/check vim
......
......@@ -73,6 +73,8 @@ envenomate grub
envenomate pcre2
envenomate less
envenomate pigz
envenomate iputils
envenomate iproute2
envenomate kbd
envenomate make
envenomate patch
......
# Copyright (c) 2019, Firas Khalil Khana
# Distributed under the terms of the ISC License
sudo /usr/bin/rm -frv $TOOL $GLAT
sudo rm -frv $TOOL $GLAT
install -dv $GLAT
sudo ln -fsv $GLAT $TOOL
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment