From d6ad23543240afd4e660ba232e868fc477ceebe0 Mon Sep 17 00:00:00 2001 From: msm-cert <156842376+msm-cert@users.noreply.github.com> Date: Mon, 29 Jan 2024 19:04:52 +0000 Subject: [PATCH] Remove package directory (#852) Co-authored-by: msm --- .github/workflows/debs.yml | 17 ----------------- CONTRIBUTING.md | 1 - docs/building_packages.rst | 1 - drakrun/package/Dockerfile | 29 ----------------------------- drakrun/package/build.sh | 27 --------------------------- drakrun/package/control.template | 12 ------------ drakrun/package/find-python.sh | 8 -------- 7 files changed, 95 deletions(-) delete mode 100644 drakrun/package/Dockerfile delete mode 100755 drakrun/package/build.sh delete mode 100644 drakrun/package/control.template delete mode 100755 drakrun/package/find-python.sh diff --git a/.github/workflows/debs.yml b/.github/workflows/debs.yml index b83fd870..49ad74ab 100644 --- a/.github/workflows/debs.yml +++ b/.github/workflows/debs.yml @@ -107,20 +107,3 @@ jobs: asset_path: ${{ steps.build_drakcore_deb.outputs.drakcore_deb_path }} asset_name: ${{ steps.build_drakcore_deb.outputs.drakcore_deb_name }} asset_content_type: application/vnd.debian.binary-package - - name: Build drakrun package - id: build_drakrun_deb - run: | - sh -c 'cd sandbox && BASEIMAGE=${{ matrix.container }} sh drakrun/package/build.sh' - DRAKRUN_DEB_PATH=$(find sandbox/out/drakrun*.deb | grep -v dbgsym | head -n1) - DRAKRUN_DEB_NAME=$(basename "$DRAKRUN_DEB_PATH") - echo "::set-output name=drakrun_deb_path::${DRAKRUN_DEB_PATH}" - echo "::set-output name=drakrun_deb_name::${{ steps.gen_vars.outputs.artifact_prefix }}_${DRAKRUN_DEB_NAME}" - - name: Upload drakrun release asset - uses: actions/upload-release-asset@v1.0.2 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.gen_vars.outputs.release_url }} - asset_path: ${{ steps.build_drakrun_deb.outputs.drakrun_deb_path }} - asset_name: ${{ steps.build_drakrun_deb.outputs.drakrun_deb_name }} - asset_content_type: application/vnd.debian.binary-package diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5ea6e3ed..bea82f1d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -39,7 +39,6 @@ The DRAKVUF Sandbox distribution packages are built using Docker, in order to ma 2. Execute: ``` sh drakcore/package/build.sh - sh drakrun/package/build.sh ``` 3. The Debian packages will be produced to the `out/` directory. You can install them similarly as you would install the released packages. See ["Basic installation" section of README.md](https://github.com/CERT-Polska/drakvuf-sandbox/blob/icedevml-patch-1/README.md#basic-installation). diff --git a/docs/building_packages.rst b/docs/building_packages.rst index fb8b327a..3b237dc3 100644 --- a/docs/building_packages.rst +++ b/docs/building_packages.rst @@ -14,7 +14,6 @@ You may build your packages from source using following commands: $ git clone https://github.com/CERT-Polska/drakvuf-sandbox.git $ cd drakvuf-sandbox $ sudo ./drakcore/package/build.sh - $ sudo ./drakrun/package/build.sh Afterwards, you should find your installation packages produced in `out/` directory. diff --git a/drakrun/package/Dockerfile b/drakrun/package/Dockerfile deleted file mode 100644 index ea9d58e0..00000000 --- a/drakrun/package/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -ARG IMAGE -FROM $IMAGE - -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update && \ - apt-get install -y \ - wget curl python2.7 python3 python3-pip python3-venv debhelper devscripts libc6-dev-i386 \ - libpixman-1-0 libpng16-16 libfdt1 libglib2.0-dev 'libjson-c[34]' libyajl2 libaio1 lsb-release && \ - if [ $(apt-cache search --names-only '^python3\.8$' | wc -l) -ne 0 ]; then apt-get install -y python3.8 python3.8-dev python3.8-venv ; else apt-get install -y python3.7 python3.7-dev python3.7-venv ; fi && \ - curl "http://snapshot.debian.org/archive/debian/20201029T084118Z/pool/main/d/dh-virtualenv/dh-virtualenv_1.2.1-1_all.deb" -o dh-virtualenv.deb && \ - pip3 install virtualenv==20.1.0 && \ - dpkg -i --ignore-depends=sphinx-rtd-theme-common ./dh-virtualenv.deb - -# This is super cursed but otherwise installation will fail -# Don't tell anyone -RUN echo -ne '#!/bin/sh\nexit 0\n' > /bin/systemctl && chmod +x /bin/systemctl - -# Install drakvuf bundle for libvmi headers -RUN wget -O drakvuf.deb "https://github.com/tklengyel/drakvuf/releases/download/1.0/debian_10-slim_drakvuf-bundle-1.0-git20221220221439+068b10f-1-generic.deb" && \ - dpkg -i ./drakvuf.deb && \ - cd /opt && \ - git clone https://xenbits.xen.org/git-http/xtf.git && \ - cd xtf && \ - git checkout 8ab15139728a8efd3ebbb60beb16a958a6a93fa1 && \ - make PYTHON=python2.7 -j4 - -COPY drakrun /build -WORKDIR /build diff --git a/drakrun/package/build.sh b/drakrun/package/build.sh deleted file mode 100755 index a60df73f..00000000 --- a/drakrun/package/build.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -# Directory with .deb files -OUTDIR=$(pwd)/out -# Base image for building -if [ "$BASEIMAGE" = "" ] -then - BASEIMAGE=debian:buster -fi - -# Current user - to make current user owner of output .deb files. -FILE_OWNER=$(id -u):$(id -g) - -echo "Building $BASEIMAGE based image into $OUTDIR" -docker build -f drakrun/package/Dockerfile \ - --build-arg IMAGE=$BASEIMAGE \ - -t deb-build . && \ -docker run --rm \ - -i \ - -v $OUTDIR:/out \ - deb-build \ - sh -c "package/find-python.sh && dpkg-buildpackage -us -uc -b && cp ../drakrun*.deb /out && chown -R $FILE_OWNER /out" - -if [ $? -ne 0 ]; then echo Failed to build package ; exit 1 ; fi - -echo Verifying package existence... -find $OUTDIR diff --git a/drakrun/package/control.template b/drakrun/package/control.template deleted file mode 100644 index 669f606f..00000000 --- a/drakrun/package/control.template +++ /dev/null @@ -1,12 +0,0 @@ -Source: drakrun -Section: admin -Priority: optional -Maintainer: Unmaintained snapshot -Build-Depends: debhelper (>= 9), python3, python3-setuptools, dh-virtualenv (>> 0.6) -Standards-Version: 3.9.5 - -Package: drakrun -Architecture: amd64 -Depends: tcpdump, genisoimage, qemu-utils, bridge-utils, dnsmasq, iptables -Pre-Depends: dpkg (>= 1.16.1), {{PYTHON_PACKAGES}}, python3-distutils -Description: DRAKVUF Sandbox Worker (standalone) diff --git a/drakrun/package/find-python.sh b/drakrun/package/find-python.sh deleted file mode 100755 index 7b9a74f2..00000000 --- a/drakrun/package/find-python.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -PYTHON_BIN_LINK=$(which python3) -PYTHON_BIN=$(readlink -f "$PYTHON_BIN_LINK") -PYTHON_PACK=$(basename "$PYTHON_BIN") - -sed "s/{{PYTHON_PACKAGES}}/${PYTHON_PACK}, lib${PYTHON_PACK}/" package/control.template > debian/control -echo -n "$PYTHON_BIN" > package/python-bin