Remove interposing from epoll-shim - broken with new upstream

ravynsoft · Oct 12, 2024 · 261bf2e · 261bf2e
1 parent c40bd2f
commit 261bf2e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/ISO/build.sh b/ISO/build.sh
@@ -350,8 +350,8 @@ ramdisk()
 
 boot() 
 {
-  cp -R "${cwd}/overlays/boot/" "${cdroot}"
   cd "${uzip}" && tar -cf - boot | tar -xf - -C "${cdroot}"
+  cp -R "${cwd}/overlays/boot/" "${cdroot}"
   cd ${cwd} && zpool export furybsd && mdconfig -d -u 0
 }
 

diff --git a/ISO/settings/rc.conf.ravynOS b/ISO/settings/rc.conf.ravynOS
@@ -1,2 +1,2 @@
 ldconfig_local_dirs="/usr/libdata/ldconfig /usr/local/libdata/ldconfig"
-windowserver_enable="YES"
+windowserver_enable="NO"
diff --git a/lib/libepoll-shim/Makefile b/lib/libepoll-shim/Makefile
@@ -21,7 +21,6 @@ SRCS=	        include/sys/epoll.h \
                 signalfd.c \
                 timerfd_ctx.c \
                 compat_socketpair.c \
-                epoll_shim_interpose.c \
                 eventfd.c \
                 wrap.c \
                 pollrdhup.c \

diff --git a/lib/libpng/Makefile b/lib/libpng/Makefile
@@ -5,7 +5,7 @@ CMAKE=	${OBJTOP}/usr.bin/cmake/bin/cmake
 CMAKE_ARGS+=    -DCMAKE_SYSTEM_PROCESSOR=x86_64
 .endif
 
-CPPFLAGS= --sysroot=${OBJTOP} ${CFLAGS:M-I*} 
+CPPFLAGS= --sysroot=${OBJTOP} ${CFLAGS:M-I*}
 CFLAGS+= -Wno-error=unused-but-set-variable
 CFLAGS+= -Wno-error=null-pointer-subtraction
 CFLAGS+= -Wno-error=missing-variable-declarations
@@ -29,6 +29,7 @@ build:
 install:
 
 distribute-me:
+	mkdir -p ${OBJTOP}/release/dist/ravynOS
 	${MAKE} -C ${MAKEOBJDIR} INSTALL=${INSTALL} \
 		DESTDIR=${OBJTOP}/release/dist/ravynOS install
 distribute: distribute-me