X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fstage2;h=355aeef54efbd920980324345a789d1f07438d34;hb=HEAD;hp=bacc9e0314625f7e132812bae82cdd08536b02c1;hpb=6dc206ab6943aff5820a462d42e827d3e7852990;p=ipfire-2.x.git

diff --git a/lfs/stage2 b/lfs/stage2
index bacc9e0314..64904fad53 100644
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  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        #
@@ -39,7 +39,7 @@ check :
 
 download :
 
-md5 :
+b2 :
 
 ###############################################################################
 # Installation Details
@@ -55,7 +55,7 @@ $(TARGET) :
 	-install -dv -m 1777 /tmp /var/tmp
 	-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 -v  /usr/{,local/}share/{misc,terminfo,zoneinfo}
 	-mkdir -pv /usr/{,local/}share/man/man{1..8}
 	#-for dir in /usr /usr/local; do \
 	#  ln -sv share/{man,doc,info} $$dir; \
@@ -64,9 +64,12 @@ $(TARGET) :
 	# Symlink /var/run -> /run.
 	ln -svf ../run /var/run
 
-ifeq "$(IS_64BIT)" "1"
 	ln -svf lib /lib64
 	ln -svf lib /usr/lib64
+
+ifeq "$(BUILD_ARCH)" "riscv64"
+	ln -svf . /lib/lp64d
+	ln -svf . /usr/lib/lp64d
 endif
 
 	# Symlinks
@@ -80,11 +83,14 @@ 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
+	touch /etc/fstab
+	ln -s /proc/self/mounts /etc/mtab
 	echo "$(NAME) v$(VERSION) - $(SLOGAN)" >  /etc/issue
 	echo "===============================" >> /etc/issue
 	echo "\n running on \s \r \m"          >> /etc/issue
+	-cat /etc/motd >> /etc/issue
 
 	# Bash startup files
 	install --directory --mode=0755 --owner=root --group=root /etc/profile.d
@@ -106,10 +112,8 @@ endif
 
 	# 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/
-	
+
 	# Install firewall scripts.
 	mkdir -pv /usr/lib/firewall
 	install -m 755 $(DIR_SRC)/config/firewall/rules.pl \
@@ -125,7 +129,7 @@ endif
 
 	# Create /var dirs and files
 	-mkdir -v /var/{lock,log,mail,spool,empty}
-	-mkdir -pv /var/{opt,cache,lib/{misc,locate},local}
+	-mkdir -pv /var/{opt,cache,lib/misc,local}
 	-mkdir -pv /var/log/{counter,calamaris}
 	chown nobody.nobody /var/log/calamaris
 	touch /var/log/{btmp,lastlog,wtmp}
@@ -135,14 +139,10 @@ endif
 
 	# Permissions
 	chmod 0711 /var/empty
-	
+
 	# A small hack to include /root to the iso but not all of it's files.
 	touch /root/ipfire
 
-	# License agreement
-	-mkdir -pv /usr/share/doc/licenses/
-	cp -vf $(DIR_SRC)/doc/COPYING /usr/share/doc/licenses/GPLv3
-
 	# System release
 	echo "$(SYSTEM_RELEASE)" > /etc/system-release
 
@@ -159,4 +159,8 @@ endif
 	-mkdir -pv /opt/pakfire/db/core
 	echo "$(CORE)" > /opt/pakfire/db/core/mine
 
+	# IPblocklist.
+	-mkdir -pv /var/lib/ipblocklist
+	chown nobody:nobody /var/lib/ipblocklist
+
 	@$(POSTBUILD)