Build cleanup for temp ISO

ravynsoft · May 8, 2022 · 4379804 · 4379804
1 parent 0f3bef1
commit 4379804
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/Frameworks/Makefile b/Frameworks/Makefile
@@ -2,12 +2,12 @@ CIRRUS_BUILD_ID?= local
 MK_WERROR= no
 WARN?= 1
 WORLDTMP= /usr/obj/${TOPDIR}/${MACHINE}.${MACHINE}
-#CFLAGS+= -I ${WORLDTMP}/tmp/usr/include \
-CFLAGS+=	-B ${WORLDTMP}/usr/bin
+CFLAGS+= -I ${WORLDTMP}/tmp/usr/include
+#CFLAGS+=	-B ${WORLDTMP}/usr/bin
 LDFLAGS+= -B ${WORLDTMP}/usr/bin \
 	-L ${WORLDTMP}/tmp/lib -L ${WORLDTMP}/tmp/usr/lib
 
-.export WARN MK_WERROR CFLAGS
+.export WARN MK_WERROR CFLAGS LDFLAGS
 
 SUBDIR+=	setup .WAIT
 SUBDIR+=	CoreFoundation

diff --git a/ISO/build.sh b/ISO/build.sh
@@ -429,7 +429,7 @@ split()
 cleanup
 workspace
 repos
-pkg
+#pkg
 base
 packages
 initgfx

diff --git a/ISO/overlays/ramdisk/init.sh b/ISO/overlays/ramdisk/init.sh
@@ -79,9 +79,6 @@ cat > /etc/bootstrap <<EOT
 #!/rescue/sh
 
 rm -f /var/run/nologin
-mount -t devfs none /dev
-mount -t procfs none /proc
-mount -t fdescfs none /dev/fd
 EOT
 chmod 755 /etc/bootstrap
 

diff --git a/ISO/overlays/uzip/ravynos/manifest b/ISO/overlays/uzip/ravynos/manifest
@@ -1,6 +1,6 @@
 cat << EOF
 name:          ravynOS
-version:       $(head -1 ${RAVYNOS}/version.txt)
+version:       $(head -1 ${RAVYN}/version.txt)
 origin:        ravynOS
 comment:       Package that installs ravynOS core components
 arch:          freebsd:13:x86:64

diff --git a/ISO/scripts/build-pkg.sh b/ISO/scripts/build-pkg.sh
@@ -108,7 +108,7 @@ export DIR_SIZE
 
 
 # Create the package
-pkg create --verbose -r ${STAGEDIR} -m . -o .
+IGNORE_OSVERSION=yes pkg create --verbose -r ${STAGEDIR} -m . -o .
 
 # Replace transient-packages-list with a new one reflecting all transient packages;
 # this will be used for installing them later on