galeb

чување 831d0a6fa006a753af360237b8fc1bdbbaf99a67
родитељ 6ed0798fe2137993396fad6e5306f35941796271
Аутор: Страхиња Радић <contact@strahinja.org>
Датум:   Sat, 17 Sep 2022 12:08:25 +0200

Add GNU tar in /sucks/bin/tar, change Perl's configuration to use it (necessary for cpan command to work); update BOOTING, FAQ

Signed-off-by: Страхиња Радић <contact@strahinja.org>

Diffstat:
M
03-packages.sh
 | 
48
++++++++++++++++++++++++++++++++++++++++++++++--
M
BOOTING
 | 
4
++--
M
FAQ
 | 
2
+-

измењених датотека: 3, додавања: 49(+), брисања: 5(-)
diff --git a/03-packages.sh b/03-packages.sh
@@ -33,7 +33,7 @@ msg info "Creating symlinks"
 
 begin_step "packages"
 
-totalsubsteps=133
+totalsubsteps=134
 substep=1
 
 msg info "Creating temporary links"
@@ -1243,6 +1243,49 @@ timestamp=$(date +'%Y-%m-%d %T')
 printf "%s\t%s\t%s\n" gnu-sed 4.8 "${timestamp}" >>${G_PKGDB}
 end_substep
 
+begin_substep tar-1.34
+if [ -x /sucks/bin/tar ]; then
+	msg info "%s exists, skipping %s" /sucks/bin/tar ${pkg}
+elif [ -e ${G_SPKG}/gnu-tar-1.34.tar.xz ]; then
+	unpack_pkg ${pkg} /
+else
+	extract_pkg ${G_SRC} ${pkg} ${pkg}.tar.xz gnu-tar-1.34
+	(
+		cd_or_fail ${G_SRC}/gnu-tar-1.34
+
+		cat <<! >MKPK
+mkpk_name()
+{
+	printf "%s" "gnu-tar-1.34"
+}
+
+mkpk_install()
+{
+	CFLAGS='-Os -pipe -static --static -fcommon -fPIC'
+	LDFLAGS='-static --static -fcommon'
+	PREFIX=/sucks
+	DESTDIR=/build
+	export CFLAGS LDFLAGS PREFIX DESTDIR
+
+	FORCE_UNSAFE_CONFIGURE=1 \\
+	./configure --prefix="\${PREFIX}" || exit 1
+
+	make ${JN} || exit 1
+	make install-strip || exit 1
+
+	mv \${DESTDIR}\${PREFIX}/share/man/man1/tar.1 \\
+		\${DESTDIR}\${PREFIX}/share/man/man1/gnu-tar.1
+}
+!
+		mkpk gnu-tar-1.34
+		remove_dir ${G_SRC}/gnu-tar-1.34
+		unpack_pkg gnu-tar-1.34 /
+	) || exit 1
+fi
+timestamp=$(date +'%Y-%m-%d %T')
+printf "%s\t%s\t%s\n" gnu-tar 1.34 "${timestamp}" >>${G_PKGDB}
+end_substep
+
 begin_substep bzip2-1.0.8
 if [ -x /bin/bzip2 ]; then
 	msg info "%s exists, skipping %s" /bin/bzip2 ${pkg}
@@ -2092,7 +2135,7 @@ mkpk_install()
 	export BUILD_BZIP2 BUILD_ZLIB
 
 	rm -rf cpan/Compress-Raw-Bzip2/bzip2-src
-	sed -i '/\(bzip2\|zzz\)-src/d' MANIFEST
+	/sucks/bin/sed -i '/\(bzip2\|zzz\)-src/d' MANIFEST
 
 	sh Configure \
 		-des -Dprefix=/sucks                           \
@@ -2107,6 +2150,7 @@ mkpk_install()
 		-Dman1dir=/sucks/share/man/man1                \
 		-Dman3dir=/sucks/share/man/man3                \
 		-Dpager="/bin/less -isR"                       \
+		-Dtar="/sucks/bin/tar"                         \
 		-Duseshrplib                                   \
 		-Dusethreads                                   \
 		-Dcccdlflags='-fPIC' -Dccdlflags='-rdynamic'
diff --git a/BOOTING b/BOOTING
@@ -122,11 +122,11 @@ After the boot scripts have finished, you will be presented with a choice to
 create a boot image. The boot image will be compressed with xz and needs to be
 sent to a USB flash medium, for example:
 
-	# xz -dc galeb-2.1-x86_64-20220813.raw.xz > /dev/sdb
+	# xz -dc galeb-2.1-x86_64-20220913.raw.xz > /dev/sdb
 
 or, if you have pv[4]:
 
-	# xz -dc galeb-2.1-x86_64-20220813.raw.xz | pv > /dev/sdb
+	# xz -dc galeb-2.1-x86_64-20220913.raw.xz | pv > /dev/sdb
 
 _Be careful when specifying the device you send the output to, in order to not
 overwrite any existing partitions (your hard disk, etc)!_ You can find out the
diff --git a/FAQ b/FAQ
@@ -141,7 +141,7 @@ A: Quoting `man fakechroot`:
    root). You are _expected_ to at least set your username in lib/env.sh before
    running bootstrap scripts.
 
-Q: Why use LibreSSL instead of BearSSL?
+Q: Why use OpenSSL instead of BearSSL?
 A: Python doesn't support it yet (apparently?):
 	https://github.com/oasislinux/oasis/issues/14