overby.me / darling-nix
this repo has no description
1
fork

Configure Feed

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

Merge pull request #825 from TheBrokenRail/better-deb

Use elfdep To get shlibdeps for DEB

authored by

Ariel Abreu and committed by
GitHub 2880f15a edcf942f

+55 -35
+2 -4
.circleci/config.yml
··· 37 37 name: Build DSCs 38 38 no_output_timeout: 30m 39 39 command: | 40 - export DEB_DISTRO=$(lsb_release -cs) 41 - tools/makedeb --dsc 40 + tools/debian/make-deb --dsc 42 41 - run: 43 42 name: Move DSCs 44 43 command: mkdir source && mv ../*~$(lsb_release -cs).* source ··· 46 45 name: Build DEBs 47 46 no_output_timeout: 30m 48 47 command: | 49 - export DEB_DISTRO=$(lsb_release -cs) 50 - tools/makedeb 48 + tools/debian/make-deb 51 49 - run: 52 50 name: Move DEBs 53 51 command: mkdir dist && mv ../*.deb dist
+1 -1
debian/control
··· 7 7 8 8 Package: darling 9 9 Architecture: amd64 10 - Depends: ${shlibs:Depends}, ${misc:Depends}, fuse, darling-dkms 10 + Depends: ${shlibs:Depends}, ${misc:Depends}, ${macho:Depends}, fuse, darling-dkms 11 11 Description: Darling 12 12 macOS emulation layer for Linux 13 13
-3
debian/darling-dkms.lintian-overrides
··· 1 - package-contains-vcs-control-file usr/src/darling-mach-0.1/lkm/.gitignore 2 - executable-not-elf-or-script usr/src/darling-mach-0.1/lkm* 3 - extended-description-is-empty
+1 -1
debian/rules
··· 11 11 12 12 override_dh_makeshlibs: 13 13 dh_makeshlibs 14 - # TODO: append ELF files referenced from Mach-Os into debian/darling.shlibs 14 + tools/debian/make-shlibdeps 15 15 16 16 override_dh_clean: 17 17 dh_clean -X.orig -X.bak -X~
-6
debian/source/lintian-overrides
··· 1 - darling source: configure-generated-file-in-source * 2 - darling source: autotools-pkg-config-macro-not-cross-compilation-safe * 3 - darling source: source-contains-prebuilt-windows-binary * 4 - darling source: maintainer-script-lacks-debhelper-token debian/* 5 - darling source: debhelper-but-no-misc-depends darling-dkms 6 - darling source: package-needs-versioned-debhelper-build-depends 10
+20
tools/debian/make-deb
··· 1 + #!/bin/sh 2 + set -e 3 + 4 + DATE=$(date +%Y%m%d) 5 + rm -f debian/changelog 6 + DISTRO=${DEB_DISTRO:-"$(lsb_release -cs)"} 7 + VERSION=0.1.${DATE}~${DISTRO} 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 + 10 + if [ "$1" = "--dsc" ]; then 11 + ARG='-S -d' 12 + if [ -e "../darling_${VERSION}.orig.tar.xz" ]; then 13 + rm ../darling_${VERSION}.orig.tar.xz 14 + fi 15 + tar -cJf ../darling_${VERSION}.orig.tar.xz . 16 + else 17 + ARG='-b' 18 + fi 19 + 20 + debuild --no-lintian -us -uc ${ARG}
+16
tools/debian/make-shlibdeps
··· 1 + #!/bin/sh 2 + 3 + set -e 4 + 5 + DEB_PACKAGE='darling' 6 + 7 + ARGS_FILE="$(mktemp)" 8 + 9 + find "debian/${DEB_PACKAGE}" -type f -exec tools/debian/make-shlibdeps-file "${ARGS_FILE}" {} \; 10 + 11 + OUT="$(mktemp)" 12 + clang -shared -o "${OUT}"$(cat ${ARGS_FILE}) 13 + dpkg-shlibdeps -T"debian/${DEB_PACKAGE}.substvars" -p"macho" -e"${OUT}" > /dev/null 2>&1 14 + 15 + rm -f "${ARGS_FILE}" 16 + rm -f "${OUT}"
+15
tools/debian/make-shlibdeps-file
··· 1 + #!/bin/sh 2 + 3 + set -e 4 + 5 + PATH="$(pwd)/debbuild/src/buildtools:${PATH}" 6 + 7 + if ! LIBS="$(elfdep "$2" 2>&1)"; then 8 + exit 9 + fi 10 + 11 + ARGS='' 12 + 13 + for lib in ${LIBS}; do 14 + printf " -l:${lib}" >> "$1" 15 + done
-20
tools/makedeb
··· 1 - #!/bin/sh 2 - set -e 3 - 4 - DATE=$(date +%Y%m%d) 5 - rm -f debian/changelog 6 - DISTRO=${DEB_DISTRO:-testing} 7 - VERSION=0.1.${DATE}~${DISTRO} 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 - 10 - if [ "$1" = "--dsc" ]; then 11 - ARG='-S -d' 12 - if [ -e "../darling_${VERSION}.orig.tar.xz" ]; then 13 - rm ../darling_${VERSION}.orig.tar.xz 14 - fi 15 - tar -cJf ../darling_${VERSION}.orig.tar.xz . 16 - else 17 - ARG='-b' 18 - fi 19 - 20 - debuild -us -uc ${ARG}