this repo has no description
Merge branch 'master' into feature/coreaudio-impl
+68
-97
+2
-2
.gitmodules
+2
-2
.gitmodules
···
209
209
[submodule "src/external/doc_cmds"]
210
210
path = src/external/doc_cmds
211
211
url = ../darling-doc_cmds.git
212
-
[submodule "src/lkm"]
213
-
path = src/lkm
212
+
[submodule "src/external/lkm"]
213
+
path = src/external/lkm
214
214
url = ../darling-newlkm.git
215
215
[submodule "src/external/basic_cmds"]
216
216
path = src/external/basic_cmds
-2
CMakeLists.txt
-2
CMakeLists.txt
···
59
59
60
60
enable_language(ASM-ATT)
61
61
62
-
option(FRAMEWORK_COREAUDIO "Enable audio-related functionality" OFF)
63
-
option(FRAMEWORK_APPKIT "Enable AppKit development code" OFF)
64
62
option(FULL_BUILD "Include large items in the build" ON)
65
63
option(TARGET_i386 "Enable i386 slices" ON)
66
64
option(TARGET_x86_64 "Enable x86_64 slices" ON)
+1
-1
debian/control
+1
-1
debian/control
···
3
3
Section: misc
4
4
Priority: optional
5
5
Standards-Version: 4.4.0
6
-
Build-Depends: cmake, clang, bison, flex, libfuse-dev, libudev-dev, pkg-config, libc6-dev-i386, linux-headers-generic, gcc-multilib, libcairo2-dev, libgl1-mesa-dev, libtiff5-dev, libfreetype6-dev, libelf-dev, libxml2-dev, libegl1-mesa-dev, libfontconfig1-dev, libbsd-dev, debhelper, ninja-build, python
6
+
Build-Depends: cmake, clang, bison, flex, libfuse-dev, libudev-dev, pkg-config, libc6-dev-i386, linux-headers-generic, gcc-multilib, libcairo2-dev, libgl1-mesa-dev, libtiff5-dev, libfreetype6-dev, libelf-dev, libxml2-dev, libegl1-mesa-dev, libfontconfig1-dev, libbsd-dev, debhelper, ninja-build, python, libxrandr-dev, libxcursor-dev
7
7
8
8
Package: darling
9
9
Architecture: amd64
+2
-2
debian/darling-dkms.install
+2
-2
debian/darling-dkms.install
···
1
-
src/lkm /usr/src/darling-mach-0.1
2
-
debbuild/src/lkm/osfmk /usr/src/darling-mach-0.1/miggen
1
+
src/external/lkm /usr/src/darling-mach-0.1
2
+
debbuild/src/external/lkm/osfmk /usr/src/darling-mach-0.1/miggen
3
3
debbuild/src/startup/rtsig.h /usr/src/darling-mach-0.1/lkm/darling
4
4
debian/dkms.conf /usr/src/darling-mach-0.1
+1
-1
kernel-include/libkern/libkern
+1
-1
kernel-include/libkern/libkern
+1
-1
platform-include/System/libkern
+1
-1
platform-include/System/libkern
+2
-2
rpm/SPECS/darling.spec
+2
-2
rpm/SPECS/darling.spec
···
62
62
%{make_build} lkm_generate
63
63
popd
64
64
%{__install} -d -m 755 %{?buildroot}/usr/src/%{name}-mach-%{version}/miggen
65
-
cp -dr --no-preserve=ownership src/lkm %{?buildroot}/usr/src/%{name}-mach-%{version}/lkm
66
-
cp -dr --no-preserve=ownership build/src/lkm/osfmk %{?buildroot}/usr/src/%{name}-mach-%{version}/miggen/osfmk
65
+
cp -dr --no-preserve=ownership src/external/lkm %{?buildroot}/usr/src/%{name}-mach-%{version}/lkm
66
+
cp -dr --no-preserve=ownership build/src/external/lkm/osfmk %{?buildroot}/usr/src/%{name}-mach-%{version}/miggen/osfmk
67
67
# Copy rtsig.h
68
68
cp -dr --no-preserve=ownership build/src/startup/rtsig.h %{?buildroot}/usr/src/%{name}-mach-%{version}/lkm/darling/
69
69
+3
-13
src/CMakeLists.txt
+3
-13
src/CMakeLists.txt
···
73
73
set(CMAKE_AR "${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/ar/x86_64-apple-darwin11-ar")
74
74
set(CMAKE_RANLIB "${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/misc/ranlib")
75
75
76
-
77
-
#if (FRAMEWORK_COREAUDIO)
78
-
# add_subdirectory(AudioToolbox)
79
-
# add_subdirectory(AudioUnit)
80
-
#endif (FRAMEWORK_COREAUDIO)
81
-
#if (FRAMEWORK_APPKIT)
82
-
# add_subdirectory(external/AppKit)
83
-
#endif (FRAMEWORK_APPKIT)
84
-
#add_subdirectory(IOKit)
85
-
86
76
add_definitions(-target x86_64-apple-darwin11)
87
77
include(darling_lib)
88
78
···
172
162
${CMAKE_CURRENT_SOURCE_DIR}/kperf/include
173
163
${CMAKE_CURRENT_SOURCE_DIR}/external/dtrace/head
174
164
${CMAKE_CURRENT_SOURCE_DIR}/ScriptingBridge/include
175
-
${CMAKE_CURRENT_SOURCE_DIR}/lkm/include
165
+
${CMAKE_CURRENT_SOURCE_DIR}/external/lkm/include
176
166
${CMAKE_CURRENT_SOURCE_DIR}/libDiagnosticMessagesClient/include
177
167
${CMAKE_CURRENT_SOURCE_DIR}/SecurityInterface/include
178
168
${CMAKE_CURRENT_SOURCE_DIR}/DrawSprocket/include
···
322
312
add_subdirectory(external/gpatch)
323
313
add_subdirectory(external/gnudiff)
324
314
add_subdirectory(external/openssh)
325
-
#add_subdirectory(external/top)
315
+
add_subdirectory(external/top)
326
316
add_subdirectory(external/perl)
327
317
add_subdirectory(external/mail_cmds)
328
318
add_subdirectory(external/screen)
···
414
404
add_subdirectory(external/bmalloc)
415
405
add_subdirectory(external/dtrace)
416
406
417
-
add_subdirectory(lkm)
407
+
add_subdirectory(external/lkm)
418
408
419
409
add_subdirectory(external/cocotron/Onyx2D)
420
410
add_subdirectory(external/cocotron/AppKit)
+3
-34
src/frameworks/CoreServices/Components.cpp
+3
-34
src/frameworks/CoreServices/Components.cpp
···
2
2
#include "Components.h"
3
3
#include "ComponentsInternal.h"
4
4
#include "darling-config.h"
5
-
#ifdef FRAMEWORK_COREAUDIO
6
-
#include <AudioUnit/AUComponent.h>
7
-
#include <AudioUnit/AudioUnitBase.h>
8
-
#endif
9
5
#include <CoreServices/MacErrors.h>
10
6
11
7
#define TRACE1(x)
···
14
10
Component FindNextComponent(Component prev, ComponentDescription* desc)
15
11
{
16
12
TRACE2(prev, desc);
17
-
#ifdef FRAMEWORK_COREAUDIO
18
-
if ((desc->componentType & 0xffff0000) == kComponentTypeAudioUnit)
19
-
{
20
-
return AudioComponentFindNext((AudioComponent) prev, (AudioComponentDescription*) desc);
21
-
}
22
-
else
23
-
#endif
24
-
return nullptr;
13
+
return nullptr;
25
14
}
26
15
27
16
long CountComponents(ComponentDescription* desc)
28
17
{
29
-
#ifdef FRAMEWORK_COREAUDIO
30
-
if ((desc->componentType & 0xffff0000) == kComponentTypeAudioUnit)
31
-
{
32
-
return AudioComponentCount((AudioComponentDescription*) desc);
33
-
}
34
-
else
35
-
#endif
36
-
return 0;
18
+
return 0;
37
19
}
38
20
39
21
OSErr OpenAComponent(Component comp, ComponentInstance* out)
···
45
27
46
28
*out = nullptr;
47
29
48
-
#ifdef FRAMEWORK_COREAUDIO
49
-
if (GetComponentType(comp) == kComponentTypeAudioUnit)
50
-
{
51
-
AudioComponentInstance inst;
52
-
OSErr err;
53
-
54
-
err = AudioComponentInstanceNew((AudioComponent) comp, &inst);
55
-
56
-
*out = inst;
57
-
return err;
58
-
}
59
-
else
60
-
#endif
61
-
return unimpErr;
30
+
return unimpErr;
62
31
}
63
32
64
33
ComponentInstance OpenComponent(Component comp)
-2
src/include/darling-config.h.in
-2
src/include/darling-config.h.in
+1
-1
src/kernel/emulation/linux/bsdthread/bsdthread_terminate.c
+1
-1
src/kernel/emulation/linux/bsdthread/bsdthread_terminate.c
+1
-1
src/kernel/emulation/linux/bsdthread/pthread_canceled.c
+1
-1
src/kernel/emulation/linux/bsdthread/pthread_canceled.c
+1
-1
src/kernel/emulation/linux/bsdthread/pthread_chdir.c
+1
-1
src/kernel/emulation/linux/bsdthread/pthread_chdir.c
+1
-1
src/kernel/emulation/linux/bsdthread/pthread_fchdir.c
+1
-1
src/kernel/emulation/linux/bsdthread/pthread_fchdir.c
+1
-1
src/kernel/emulation/linux/bsdthread/pthread_kill.c
+1
-1
src/kernel/emulation/linux/bsdthread/pthread_kill.c
+1
-1
src/kernel/emulation/linux/bsdthread/pthread_markcancel.c
+1
-1
src/kernel/emulation/linux/bsdthread/pthread_markcancel.c
+1
-1
src/kernel/emulation/linux/mach/lkm.c
+1
-1
src/kernel/emulation/linux/mach/lkm.c
+1
-1
src/kernel/emulation/linux/mach/mach_traps.c
+1
-1
src/kernel/emulation/linux/mach/mach_traps.c
+1
-1
src/kernel/emulation/linux/misc/ptrace.c
+1
-1
src/kernel/emulation/linux/misc/ptrace.c
+1
-1
src/kernel/emulation/linux/process/wait4.c
+1
-1
src/kernel/emulation/linux/process/wait4.c
+1
-1
src/kernel/emulation/linux/psynch/psynch_cvbroad.c
+1
-1
src/kernel/emulation/linux/psynch/psynch_cvbroad.c
···
3
3
#include "psynch_errno.h"
4
4
#include <linux-syscalls/linux.h>
5
5
#include "../mach/lkm.h"
6
-
#include "../../../../lkm/api.h"
6
+
#include "../../../../external/lkm/api.h"
7
7
8
8
long sys_psynch_cvbroad(void* cv, uint64_t cvlsgen, uint64_t cvudgen, uint32_t flags, void* mutex, uint64_t mugen,
9
9
uint64_t tid)
+1
-1
src/kernel/emulation/linux/psynch/psynch_cvclrprepost.c
+1
-1
src/kernel/emulation/linux/psynch/psynch_cvclrprepost.c
···
3
3
#include "psynch_errno.h"
4
4
#include <linux-syscalls/linux.h>
5
5
#include "../mach/lkm.h"
6
-
#include "../../../../lkm/api.h"
6
+
#include "../../../../external/lkm/api.h"
7
7
#include "../simple.h"
8
8
9
9
long sys_psynch_cvclrprepost(void* cv, uint32_t cvgen, uint32_t cvugen, uint32_t cvsgen, uint32_t prepocnt, uint32_t preposeq, uint32_t flags)
+1
-1
src/kernel/emulation/linux/psynch/psynch_cvsignal.c
+1
-1
src/kernel/emulation/linux/psynch/psynch_cvsignal.c
···
3
3
#include "psynch_errno.h"
4
4
#include <linux-syscalls/linux.h>
5
5
#include "../mach/lkm.h"
6
-
#include "../../../../lkm/api.h"
6
+
#include "../../../../external/lkm/api.h"
7
7
#include "../simple.h"
8
8
9
9
long sys_psynch_cvsignal(void* cv, uint32_t cvlsgen, uint32_t cvugen, int thread_port, void* mutex, uint32_t mugen,
+1
-1
src/kernel/emulation/linux/psynch/psynch_cvwait.c
+1
-1
src/kernel/emulation/linux/psynch/psynch_cvwait.c
+1
-1
src/kernel/emulation/linux/psynch/psynch_mutexdrop.c
+1
-1
src/kernel/emulation/linux/psynch/psynch_mutexdrop.c
···
3
3
#include "psynch_errno.h"
4
4
#include <linux-syscalls/linux.h>
5
5
#include "../mach/lkm.h"
6
-
#include "../../../../lkm/api.h"
6
+
#include "../../../../external/lkm/api.h"
7
7
#include "../simple.h"
8
8
9
9
long sys_psynch_mutexdrop(void* mutex, uint32_t mgen, uint32_t ugen, uint64_t tid, uint32_t flags)
+1
-1
src/kernel/emulation/linux/psynch/psynch_mutexwait.c
+1
-1
src/kernel/emulation/linux/psynch/psynch_mutexwait.c
···
3
3
#include "psynch_errno.h"
4
4
#include <linux-syscalls/linux.h>
5
5
#include "../mach/lkm.h"
6
-
#include "../../../../lkm/api.h"
6
+
#include "../../../../external/lkm/api.h"
7
7
#include "../simple.h"
8
8
9
9
long sys_psynch_mutexwait(void* mutex, uint32_t mgen, uint32_t ugen, uint64_t tid, uint32_t flags)
+1
-1
src/kernel/emulation/linux/psynch/psynch_rw_rdlock.c
+1
-1
src/kernel/emulation/linux/psynch/psynch_rw_rdlock.c
···
3
3
#include "psynch_errno.h"
4
4
#include <linux-syscalls/linux.h>
5
5
#include "../mach/lkm.h"
6
-
#include "../../../../lkm/api.h"
6
+
#include "../../../../external/lkm/api.h"
7
7
#include "../simple.h"
8
8
9
9
long sys_psynch_rw_rdlock(void* rwlock, uint32_t lgenval, uint32_t ugenval, uint32_t rw_wc, int flags)
+1
-1
src/kernel/emulation/linux/psynch/psynch_rw_unlock.c
+1
-1
src/kernel/emulation/linux/psynch/psynch_rw_unlock.c
···
3
3
#include "psynch_errno.h"
4
4
#include <linux-syscalls/linux.h>
5
5
#include "../mach/lkm.h"
6
-
#include "../../../../lkm/api.h"
6
+
#include "../../../../external/lkm/api.h"
7
7
#include "../simple.h"
8
8
9
9
long sys_psynch_rw_unlock(void* rwlock, uint32_t lgenval, uint32_t ugenval, uint32_t rw_wc, int flags)
+1
-1
src/kernel/emulation/linux/psynch/psynch_rw_wrlock.c
+1
-1
src/kernel/emulation/linux/psynch/psynch_rw_wrlock.c
···
3
3
#include "psynch_errno.h"
4
4
#include <linux-syscalls/linux.h>
5
5
#include "../mach/lkm.h"
6
-
#include "../../../../lkm/api.h"
6
+
#include "../../../../external/lkm/api.h"
7
7
#include "../simple.h"
8
8
9
9
long sys_psynch_rw_wrlock(void* rwlock, uint32_t lgenval, uint32_t ugenval, uint32_t rw_wc, int flags)
+1
-1
src/kernel/emulation/linux/signal/kill.c
+1
-1
src/kernel/emulation/linux/signal/kill.c
+2
-2
src/kernel/emulation/linux/signal/sigexc.c
+2
-2
src/kernel/emulation/linux/signal/sigexc.c
···
9
9
#include "signal/exc.h"
10
10
#include "sigaltstack.h"
11
11
#include "../mach/lkm.h"
12
-
#include "../../../../lkm/api.h"
12
+
#include "../../../../external/lkm/api.h"
13
13
#include "../../../libsyscall/wrappers/_libkernel_init.h"
14
14
#include "kill.h"
15
15
#include "../simple.h"
···
134
134
135
135
//char buf[128];
136
136
//__simple_sprintf(xyzbuf, "Setting handler for RT signal %d: %d", signum, rv);
137
-
//lkm_call(0x1028, buf);
137
+
//external/lkm_call(0x1028, buf);
138
138
}
139
139
140
140
bool darling_am_i_ptraced(void)
+1
-1
src/kernel/emulation/linux/unistd/getegid.c
+1
-1
src/kernel/emulation/linux/unistd/getegid.c
+1
-1
src/kernel/emulation/linux/unistd/geteuid.c
+1
-1
src/kernel/emulation/linux/unistd/geteuid.c
+1
-1
src/kernel/emulation/linux/unistd/getgid.c
+1
-1
src/kernel/emulation/linux/unistd/getgid.c
+1
-1
src/kernel/emulation/linux/unistd/gettid.c
+1
-1
src/kernel/emulation/linux/unistd/gettid.c
+1
-1
src/kernel/emulation/linux/unistd/getuid.c
+1
-1
src/kernel/emulation/linux/unistd/getuid.c
+1
-1
src/kernel/emulation/linux/unistd/setegid.c
+1
-1
src/kernel/emulation/linux/unistd/setegid.c
+1
-1
src/kernel/emulation/linux/unistd/seteuid.c
+1
-1
src/kernel/emulation/linux/unistd/seteuid.c
+1
-1
src/kernel/emulation/linux/unistd/setgid.c
+1
-1
src/kernel/emulation/linux/unistd/setgid.c
+1
-1
src/kernel/emulation/linux/unistd/settid.c
+1
-1
src/kernel/emulation/linux/unistd/settid.c
+1
-1
src/kernel/emulation/linux/unistd/setuid.c
+1
-1
src/kernel/emulation/linux/unistd/setuid.c
+1
-1
src/kernel/libsyscall/CMakeLists.txt
+1
-1
src/kernel/libsyscall/CMakeLists.txt
···
21
21
add_definitions(-DIOKIT_ALL_IPC=1 -DIOKIT=1)
22
22
#add_definitions(-DKERNEL)
23
23
24
-
include_directories(${CMAKE_SOURCE_DIR}/src/lkm/osfmk)
24
+
include_directories(${CMAKE_SOURCE_DIR}/src/external/lkm/osfmk)
25
25
set(MIG_USER_HEADER_SUFFIX "_internal.h")
26
26
mig(mach/host_priv.defs)
27
27
mig(mach/host_security.defs)
+1
-1
src/launchd/src/mach_exc.defs
+1
-1
src/launchd/src/mach_exc.defs
+1
-1
src/launchd/src/notify.defs
+1
-1
src/launchd/src/notify.defs
+16
-1
src/libelfloader/loader.c
+16
-1
src/libelfloader/loader.c
···
82
82
}
83
83
#endif
84
84
85
+
static unsigned long processEnvVariable(const char* var)
86
+
{
87
+
if (strncmp(var, "HOME=/Users/", 12) == 0)
88
+
{
89
+
const size_t len = strlen(var);
90
+
char* home = malloc(len); // 1 byte shorter
91
+
92
+
strcpy(home, "HOME=/home/");
93
+
strcpy(home + 11, var+12);
94
+
95
+
return (unsigned long) home;
96
+
}
97
+
return (unsigned long) var;
98
+
}
99
+
85
100
void run(const char* path, const char** envp)
86
101
{
87
102
struct loader_context lc;
···
131
146
132
147
133
148
for (int i = 0; envp[i] != NULL; i++)
134
-
stack[pos++] = (unsigned long) envp[i];
149
+
stack[pos++] = processEnvVariable(envp[i]);
135
150
136
151
#ifdef __linux__ // For testing
137
152
getrandom(entropy, sizeof(entropy), 0);
+1
src/native/CMakeLists.txt
+1
src/native/CMakeLists.txt
+1
-1
tools/makedeb
+1
-1
tools/makedeb
···
8
8
EDITOR=true NAME="Darling build server" EMAIL=${DEB_EMAIL:-noreply@darlinghq.org} dch -u low -v ${VERSION} --create --distribution ${DISTRO} --package darling "Daily build"
9
9
10
10
if [ "$1" = "--dsc" ]; then
11
-
ARG='-S'
11
+
ARG='-S -d'
12
12
if [ -e "../darling_${VERSION}.orig.tar.xz" ]; then
13
13
rm ../darling_${VERSION}.orig.tar.xz
14
14
fi