Skip to content

Commit 261bf2e

Browse files
committed
Remove interposing from epoll-shim - broken with new upstream
1 parent c40bd2f commit 261bf2e

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

ISO/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,8 @@ ramdisk()
350350

351351
boot()
352352
{
353-
cp -R "${cwd}/overlays/boot/" "${cdroot}"
354353
cd "${uzip}" && tar -cf - boot | tar -xf - -C "${cdroot}"
354+
cp -R "${cwd}/overlays/boot/" "${cdroot}"
355355
cd ${cwd} && zpool export furybsd && mdconfig -d -u 0
356356
}
357357

ISO/settings/rc.conf.ravynOS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
ldconfig_local_dirs="/usr/libdata/ldconfig /usr/local/libdata/ldconfig"
2-
windowserver_enable="YES"
2+
windowserver_enable="NO"

lib/libepoll-shim/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ SRCS= include/sys/epoll.h \
2121
signalfd.c \
2222
timerfd_ctx.c \
2323
compat_socketpair.c \
24-
epoll_shim_interpose.c \
2524
eventfd.c \
2625
wrap.c \
2726
pollrdhup.c \

lib/libpng/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ CMAKE= ${OBJTOP}/usr.bin/cmake/bin/cmake
55
CMAKE_ARGS+= -DCMAKE_SYSTEM_PROCESSOR=x86_64
66
.endif
77

8-
CPPFLAGS= --sysroot=${OBJTOP} ${CFLAGS:M-I*}
8+
CPPFLAGS= --sysroot=${OBJTOP} ${CFLAGS:M-I*}
99
CFLAGS+= -Wno-error=unused-but-set-variable
1010
CFLAGS+= -Wno-error=null-pointer-subtraction
1111
CFLAGS+= -Wno-error=missing-variable-declarations
@@ -29,6 +29,7 @@ build:
2929
install:
3030

3131
distribute-me:
32+
mkdir -p ${OBJTOP}/release/dist/ravynOS
3233
${MAKE} -C ${MAKEOBJDIR} INSTALL=${INSTALL} \
3334
DESTDIR=${OBJTOP}/release/dist/ravynOS install
3435
distribute: distribute-me

0 commit comments

Comments
 (0)