this repo has no description
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Setup Fonts and ld.so during DEB installaton (#605)

* Update CMakeLists.txt

* Update darling.install

* Create darling.postinst

* Update rules

authored by

TheBrokenRail and committed by
Andrew Hyatt
d87d7033 a89d8406

+24 -8
+8 -5
CMakeLists.txt
··· 1 1 SET(CMAKE_SYSTEM_NAME Linux) 2 2 SET(CMAKE_SYSTEM_PROCESSOR "x86-64") 3 3 4 - 5 - 6 4 # This allows setting the compiler with -DCMAKE_C_COMPILER when configuring. 7 5 if (NOT DEFINED CMAKE_C_COMPILER) 8 6 find_program(CMAKE_C_COMPILER NAMES ··· 66 64 option(FULL_BUILD "Include large items in the build" ON) 67 65 option(TARGET_i386 "Enable i386 slices" ON) 68 66 option(TARGET_x86_64 "Enable x86_64 slices" ON) 67 + option(DEBIAN_PACKAGING "Packaging for Debian" OFF) 69 68 70 69 FindDsymutil() 71 70 ··· 108 107 InstallSymlink(/Volumes/SystemRoot/etc/localtime ${CMAKE_INSTALL_PREFIX}/libexec/darling/etc/localtime) 109 108 110 109 install(DIRECTORY DESTINATION libexec/darling/etc/ld.so.conf.d) 111 - install(CODE "execute_process(COMMAND bash ${DARLING_TOP_DIRECTORY}/src/setup-ld-so.sh WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/libexec/darling)") 112 110 install(DIRECTORY DESTINATION libexec/darling/etc/fonts/conf.d) 113 - install(CODE "execute_process(COMMAND bash ${DARLING_TOP_DIRECTORY}/src/setup-fonts.sh WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/libexec/darling)") 111 + if(NOT DEBIAN_PACKAGING) 112 + install(CODE "execute_process(COMMAND bash ${DARLING_TOP_DIRECTORY}/src/setup-ld-so.sh WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/libexec/darling)") 113 + install(CODE "execute_process(COMMAND bash ${DARLING_TOP_DIRECTORY}/src/setup-fonts.sh WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/libexec/darling)") 114 + endif(NOT DEBIAN_PACKAGING) 114 115 115 116 InstallSymlink(/Volumes/SystemRoot/lib ${CMAKE_INSTALL_PREFIX}/libexec/darling/lib) 116 117 InstallSymlink(/Volumes/SystemRoot/lib64 ${CMAKE_INSTALL_PREFIX}/libexec/darling/lib64) ··· 118 119 119 120 InstallSymlink(/Volumes/SystemRoot/usr/share/zoneinfo ${CMAKE_INSTALL_PREFIX}/libexec/darling/usr/share/zoneinfo) 120 121 121 - install(CODE "execute_process(COMMAND bash ${DARLING_TOP_DIRECTORY}/tools/shutdown-user.sh)") 122 + if(NOT DEBIAN_PACKAGING) 123 + install(CODE "execute_process(COMMAND bash ${DARLING_TOP_DIRECTORY}/tools/shutdown-user.sh)") 124 + endif(NOT DEBIAN_PACKAGING) 122 125 123 126 add_custom_target(uninstall 124 127 COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tools/uninstall
+3
debian/darling.install
··· 1 1 usr 2 + src/setup-fonts.sh usr/lib/darling 3 + src/setup-ld-so.sh usr/lib/darling 4 + tools/shutdown-user.sh usr/lib/darling
+13
debian/darling.postinst
··· 1 + #!/bin/sh 2 + set -e 3 + 4 + echo ">>> Shutting down old instances of Darling" 5 + bash /usr/lib/darling/shutdown-user.sh 6 + 7 + cd /usr/libexec/darling 8 + 9 + echo ">>> Setting up fonts" 10 + bash /usr/lib/darling/setup-fonts.sh 11 + 12 + echo ">>> Setting up ld.so" 13 + bash /usr/lib/darling/setup-ld-so.sh
-3
debian/rules
··· 22 22 chmod -R -x debian/darling-dkms/usr/src/darling-mach-0.1/lkm 23 23 24 24 override_dh_update_autotools_config: 25 - 26 - override_dh_auto_install: 27 - sudo dh_auto_install