Update documentation, minor fixes

nzbgetcom · May 30, 2024 · fb682ac · fb682ac
1 parent 4cb4b9f
commit fb682ac
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 17 deletions.
diff --git a/linux/buildroot/build-info.md b/linux/buildroot/build-info.md
@@ -78,8 +78,10 @@ Used buildroot version: `buildroot-2022.05.3` with `musl` downgraded to `1.1.24`
 - Make extra modifications:
     - package/musl/musl.mk: change MUSL_VERSION to 1.1.24
     - package/musl/musl.hash: change hashes and musl source filename
-        - sha256  1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3  musl-1.1.24.tar.gz
-        - sha256  3520d478bccbdf68d9dc0c03984efb0fa4b99868ab2599f5b5f72f3fb3b07a49  COPYRIGHT
+        ```
+        sha256  1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3  musl-1.1.24.tar.gz
+        sha256  3520d478bccbdf68d9dc0c03984efb0fa4b99868ab2599f5b5f72f3fb3b07a49  COPYRIGHT
+        ```
 - Run `make` to build the toolchain
 - After build is finished:
     - aarch64 - patch output/host/lib/gcc/aarch64-buildroot-linux-musl/9.4.0/include/arm_acle.h file:

diff --git a/linux/buildroot/build-nzbget.sh b/linux/buildroot/build-nzbget.sh
@@ -22,6 +22,13 @@ UNRAR6_VERSION=6.2.12
 UNRAR7_VERSION=7.0.7
 ZIP7_VERSION=2405
 
+# libs versions
+NCURSES_VERSION=6.4
+ZLIB_VERSION=1.3.1
+LIBXML2_VERSION=2.12.4
+OPENSSL_VERSION=3.1.2
+BOOST_VERSION=1.84.0
+
 help()
 {
     echo "Usage:"
@@ -171,7 +178,7 @@ build_lib()
                 --prefix="$PWD/../$LIB"
                 ;;
             "openssl")
-                OPENSSL_OPT=""
+                OPENSSL_OPTS=""
                 case $ARCH in
                     "i686")
                         OPENSSL_ARCH=linux-generic32
@@ -205,14 +212,14 @@ build_lib()
                 perl Configure $OPENSSL_ARCH \
                 no-shared \
                 threads \
-			    no-rc5 \
-			    enable-camellia \
-			    no-tests \
-			    no-fuzz-libfuzzer \
-			    no-fuzz-afl \
-			    no-afalgeng \
-			    zlib \
-			    no-dso \
+                no-rc5 \
+                enable-camellia \
+                no-tests \
+                no-fuzz-libfuzzer \
+                no-fuzz-afl \
+                no-afalgeng \
+                zlib \
+                no-dso \
                 $OPENSSL_OPTS \
                 --prefix="$PWD/../$LIB"
                 ;;
@@ -398,11 +405,11 @@ build_bin()
     export LDFLAGS=""
     export NZBGET_INCLUDES="$TOOLCHAIN_PATH/$ARCH/output/staging/usr/include/;"
 
-    build_lib "https://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.4.tar.gz"
-    build_lib "https://zlib.net/zlib-1.3.1.tar.gz"
-    build_lib "https://gitlab.gnome.org/GNOME/libxml2/-/archive/v2.12.4/libxml2-v2.12.4.tar.gz"
-    build_lib "https://github.com/openssl/openssl/releases/download/openssl-3.1.2/openssl-3.1.2.tar.gz"
-    build_lib "https://github.com/boostorg/boost/releases/download/boost-1.84.0/boost-1.84.0.tar.gz"
+    build_lib "https://ftp.gnu.org/pub/gnu/ncurses/ncurses-$NCURSES_VERSION.tar.gz"
+    build_lib "https://zlib.net/zlib-$ZLIB_VERSION.tar.gz"
+    build_lib "https://gitlab.gnome.org/GNOME/libxml2/-/archive/v2.12.4/libxml2-v$LIBXML2_VERSION.tar.gz"
+    build_lib "https://github.com/openssl/openssl/releases/download/openssl-3.1.2/openssl-$OPENSSL_VERSION.tar.gz"
+    build_lib "https://github.com/boostorg/boost/releases/download/boost-1.84.0/boost-$BOOST_VERSION.tar.gz"
 
     build_7zip
     build_unrar
@@ -431,7 +438,7 @@ build_bin()
         -DVERSION_SUFFIX=$VERSION_SUFFIX \
         -DCMAKE_INSTALL_PREFIX=$NZBGET_ROOT/$OUTPUTDIR/install/$ARCH
     BUILD_STATUS=""
-    cmake --build $OUTPUTDIR/$ARCH -j $COREX 2>$OUTPUTDIR/$ARCH/build.log || BUILD_STATUS=$?        
+    cmake --build $OUTPUTDIR/$ARCH -j $COREX 2>$OUTPUTDIR/$ARCH/build.log || BUILD_STATUS=$?
     if [ ! -z $BUILD_STATUS ]; then
         tail -20 $OUTPUTDIR/$ARCH/build.log
         exit 1