Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch to NoisyFlake oslog #1406

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Switch to NoisyFlake oslog #1406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08b04e6
Switch to NoisyFlake oslog
L1ghtmann Jun 24, 2023
7053ea0
Update oslog.xml
L1ghtmann Jun 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions build_misc/entitlements/oslog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,29 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.logd.admin</key>
<true/>
<key>com.apple.private.debug_port</key>
<true/>
<key>com.apple.private.iosurfaceinfo</key>
<true/>
<key>com.apple.private.logging.admin</key>
<true/>
<key>com.apple.private.logging.diagnostic</key>
<true/>
<key>com.apple.private.logging.stream</key>
<true/>
<key>com.apple.private.security.no-container</key>
<true/>
<key>com.apple.private.set-atm-diagnostic-flag</key>
<true/>
<key>com.apple.system-task-ports.safe</key>
<key>com.apple.security.iokit-user-client-class</key>
<array>
<string>IOSurfaceRootUserClient</string>
</array>
<key>com.apple.system-task-ports</key>
<true/>
<key>platform-application</key>
<true/>
<key>task_for_pid-allow</key>
<true/>
</dict>
</plist>
</plist>
11 changes: 8 additions & 3 deletions makefiles/oslog.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,26 @@ endif
ifeq (,$(findstring darwin,$(MEMO_TARGET)))

SUBPROJECTS += oslog
OSLOG_VERSION := 0.0.1
OSLOG_VERSION := 0.0.4.3
DEB_OSLOG_V ?= $(OSLOG_VERSION)

oslog-setup: setup
$(call GITHUB_ARCHIVE,dlevi309,oslog,$(OSLOG_VERSION),v$(OSLOG_VERSION))
$(call GITHUB_ARCHIVE,NoisyFlake,oslog,$(OSLOG_VERSION),v$(OSLOG_VERSION))
$(call EXTRACT_TAR,oslog-$(OSLOG_VERSION).tar.gz,oslog-$(OSLOG_VERSION),oslog)
# Fixed in recent commit, but not released yet
sed -i '1s|^|#import <Foundation/Foundation.h>\n|' $(BUILD_WORK)/oslog/main.mm

ifneq ($(wildcard $(BUILD_WORK)/oslog/.build_complete),)
oslog:
@echo "Using previously built oslog."
else
oslog: oslog-setup
ifeq ($(wildcard $(BUILD_WORK)/oslog/README),)
mv $(BUILD_WORK)/oslog/README.md $(BUILD_WORK)/oslog/README
mv $(BUILD_WORK)/oslog/LICENSE.txt $(BUILD_WORK)/oslog/LICENSE
endif
ifeq ($(wildcard $(BUILD_WORK)/oslog/LICENSE),)
mv $(BUILD_WORK)/oslog/LICENSE.TXT $(BUILD_WORK)/oslog/LICENSE
endif
mkdir -p $(BUILD_STAGE)/oslog/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/bin
$(CXX) $(CXXFLAGS) -fobjc-arc $(BUILD_WORK)/oslog/main.mm -o $(BUILD_STAGE)/oslog/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/bin/oslog -framework Foundation
$(call AFTER_BUILD)
Expand Down