Revert "ncat: Update to 7.91"

[people/pmueller/ipfire-2.x.git] / lfs / stage2

diff --git a/lfs/stage2 b/lfs/stage2
index 7e8dfe3169d09cad8763d82e6e7e5ec7e2d3fee7..7483a113488a7f2232f7e0f12bead9f544d8079f 100644 (file)
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -53,7 +53,7 @@ $(TARGET) :
        -mkdir -pv /{media/{floppy,cdrom,usbkey},sbin,srv,var}
        -install -dv -m 0750 /root
        -install -dv -m 1777 /tmp /var/tmp
-       -mkdir -pv /usr/{,local/}{bin,include,lib{,/sse2},sbin,src}
+       -mkdir -pv /usr/{,local/}{bin,include,lib,sbin,src}
        -mkdir -pv /usr/{,local/}share/{doc,info,locale,man}
        -mkdir -v  /usr/{,local/}share/{misc,terminfo,xt_geoip,zoneinfo}
        -mkdir -pv /usr/{,local/}share/man/man{1..8}
@@ -69,6 +69,11 @@ ifeq "$(IS_64BIT)" "1"
        ln -svf lib /usr/lib64
 endif
 
+ifeq "$(BUILD_ARCH)" "riscv64"
+       ln -svf . /lib/lp64d
+       ln -svf . /usr/lib/lp64d
+endif
+
        # Symlinks
        # for this reason, stage2 rebuild will broke the iso:perl, grubbatch
        -ln -sv $(TOOLS_DIR)/bin/{bash,cat,echo,pwd,stty} /bin
@@ -80,6 +85,7 @@ endif
 
        # Config files
        cp -rvf $(DIR_SRC)/config/etc/* /etc;
+       [ ! -d "$(DIR_SRC)/config/etc-$(BUILD_ARCH)" ] || cp -rvf $(DIR_SRC)/config/etc-$(BUILD_ARCH)/* /etc
        cp -rvf $(DIR_SRC)/config/lib/* /lib;
        touch /etc/{fs,m}tab
        echo "$(NAME) v$(VERSION) - $(SLOGAN)" >  /etc/issue
@@ -105,6 +111,7 @@ endif
        done
 
        # Move script to correct place.
+       mv -vf /usr/local/bin/openvpn-metrics /usr/sbin/
        mv -vf /usr/local/bin/ovpn-ccd-convert /usr/sbin/
        mv -vf /usr/local/bin/ovpn-collectd-convert /usr/sbin/
        mv -vf /usr/local/bin/captive-cleanup /usr/bin/
@@ -115,8 +122,8 @@ endif
                /usr/lib/firewall/rules.pl
        install -m 644 $(DIR_SRC)/config/firewall/firewall-lib.pl \
                /usr/lib/firewall/firewall-lib.pl
-       install -m 755 $(DIR_SRC)/config/firewall/ipsec-block \
-               /usr/lib/firewall/ipsec-block
+       install -m 755 $(DIR_SRC)/config/firewall/ipsec-policy \
+               /usr/lib/firewall/ipsec-policy
 
        # Nobody user
        -mkdir -p /home/nobody
@@ -145,8 +152,17 @@ endif
        # System release
        echo "$(SYSTEM_RELEASE)" > /etc/system-release
 
+       # OS release
+       : >/etc/os-release
+       echo "NAME=\"$(NAME)\"" >> /etc/os-release
+       echo "VERSION=\"$(VERSION)\"" >> /etc/os-release
+       echo "ID=$(SNAME)" >> /etc/os-release
+       echo "VERSION_ID=2" >> /etc/os-release
+       echo "PRETTY_NAME=\"$(SYSTEM_RELEASE)\"" >> /etc/os-release
+       echo "ANSI_COLOR=\"0:31\"" >> /etc/os-release
+
        # Pakfire
        -mkdir -pv /opt/pakfire/db/core
-       echo "$(PAKFIRE_CORE)" > /opt/pakfire/db/core/mine
+       echo "$(CORE)" > /opt/pakfire/db/core/mine
 
        @$(POSTBUILD)