From abed5800539bf4959762c1ef33aa1363a2459317 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Mon, 12 Aug 2024 04:16:25 +0300 Subject: [PATCH] initial commit --- .github/build-canary-i386 | 1 - .github/build-nest-i386 | 1 - .github/release-canary-i386 | 1 - .github/release-canary-v3 | 2 +- .github/release-nest-i386 | 1 - .github/release-nest-v3 | 2 +- .github/workflows/build-canaryi386.yml | 37 ------------ .github/workflows/build-nesti386.yml | 37 ------------ .github/workflows/release-canaryi386.yml | 40 ------------- .github/workflows/release-nesti386.yml | 40 ------------- debian/15_nvidia_gbm.json | 6 ++ debian/changelog | 6 +- debian/control | 41 ++++++++------ debian/copyright | 42 ++++++++++++++ debian/gbp.conf | 3 + debian/libnvidia-egl-gbm1.install | 2 + debian/rules | 71 ++---------------------- debian/watch | 5 ++ main.sh | 16 +++--- release.sh | 1 - 20 files changed, 103 insertions(+), 252 deletions(-) delete mode 100644 .github/build-canary-i386 delete mode 100644 .github/build-nest-i386 delete mode 100644 .github/release-canary-i386 delete mode 100644 .github/release-nest-i386 delete mode 100644 .github/workflows/build-canaryi386.yml delete mode 100644 .github/workflows/build-nesti386.yml delete mode 100644 .github/workflows/release-canaryi386.yml delete mode 100644 .github/workflows/release-nesti386.yml create mode 100644 debian/15_nvidia_gbm.json mode change 100644 => 100755 debian/changelog create mode 100644 debian/gbp.conf create mode 100644 debian/libnvidia-egl-gbm1.install create mode 100644 debian/watch diff --git a/.github/build-canary-i386 b/.github/build-canary-i386 deleted file mode 100644 index 56a6051..0000000 --- a/.github/build-canary-i386 +++ /dev/null @@ -1 +0,0 @@ -1 \ No newline at end of file diff --git a/.github/build-nest-i386 b/.github/build-nest-i386 deleted file mode 100644 index 56a6051..0000000 --- a/.github/build-nest-i386 +++ /dev/null @@ -1 +0,0 @@ -1 \ No newline at end of file diff --git a/.github/release-canary-i386 b/.github/release-canary-i386 deleted file mode 100644 index 56a6051..0000000 --- a/.github/release-canary-i386 +++ /dev/null @@ -1 +0,0 @@ -1 \ No newline at end of file diff --git a/.github/release-canary-v3 b/.github/release-canary-v3 index 56a6051..d00491f 100644 --- a/.github/release-canary-v3 +++ b/.github/release-canary-v3 @@ -1 +1 @@ -1 \ No newline at end of file +1 diff --git a/.github/release-nest-i386 b/.github/release-nest-i386 deleted file mode 100644 index 56a6051..0000000 --- a/.github/release-nest-i386 +++ /dev/null @@ -1 +0,0 @@ -1 \ No newline at end of file diff --git a/.github/release-nest-v3 b/.github/release-nest-v3 index 56a6051..0cfbf08 100644 --- a/.github/release-nest-v3 +++ b/.github/release-nest-v3 @@ -1 +1 @@ -1 \ No newline at end of file +2 diff --git a/.github/workflows/build-canaryi386.yml b/.github/workflows/build-canaryi386.yml deleted file mode 100644 index 5d3fcb7..0000000 --- a/.github/workflows/build-canaryi386.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: PikaOS Package Build Only (Canary) (i386) - -on: - push: - branches: - - main - paths: - - '.github/build-canary-i386' - -jobs: - build: - runs-on: ubuntu-latest - container: - image: ghcr.io/pikaos-linux/pikaos-builder:canaryi386 - volumes: - - /proc:/proc - options: --privileged -it - - steps: - - uses: actions/checkout@v3 - - - name: Install SSH key - uses: shimataro/ssh-key-action@v2 - with: - key: ${{ secrets.SSH_KEY }} - name: id_rsa - known_hosts: ${{ secrets.KNOWN_HOSTS }} - if_key_exists: replace - - - name: Update APT Cache - run: apt-get update -y - - - name: Set Build Config - run: cp -vf ./pika-build-config/i386.sh ./pika-build-config.sh - - - name: Build Package - run: ./main.sh diff --git a/.github/workflows/build-nesti386.yml b/.github/workflows/build-nesti386.yml deleted file mode 100644 index 10c1653..0000000 --- a/.github/workflows/build-nesti386.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: PikaOS Package Build Only (i386) - -on: - push: - branches: - - main - paths: - - '.github/build-nest-i386' - -jobs: - build: - runs-on: ubuntu-latest - container: - image: ghcr.io/pikaos-linux/pikaos-builder:nesti386 - volumes: - - /proc:/proc - options: --privileged -it - - steps: - - uses: actions/checkout@v3 - - - name: Install SSH key - uses: shimataro/ssh-key-action@v2 - with: - key: ${{ secrets.SSH_KEY }} - name: id_rsa - known_hosts: ${{ secrets.KNOWN_HOSTS }} - if_key_exists: replace - - - name: Update APT Cache - run: apt-get update -y - - - name: Set Build Config - run: cp -vf ./pika-build-config/i386.sh ./pika-build-config.sh - - - name: Build Package - run: ./main.sh diff --git a/.github/workflows/release-canaryi386.yml b/.github/workflows/release-canaryi386.yml deleted file mode 100644 index 653861d..0000000 --- a/.github/workflows/release-canaryi386.yml +++ /dev/null @@ -1,40 +0,0 @@ -name: PikaOS Package Build & Release (Canary) (i386) - -on: - push: - branches: - - main - paths: - - '.github/release-canary-i386' - -jobs: - build: - runs-on: ubuntu-latest - container: - image: ghcr.io/pikaos-linux/pikaos-builder:canaryi386 - volumes: - - /proc:/proc - options: --privileged -it - - steps: - - uses: actions/checkout@v3 - - - name: Install SSH key - uses: shimataro/ssh-key-action@v2 - with: - key: ${{ secrets.SSH_KEY }} - name: id_rsa - known_hosts: ${{ secrets.KNOWN_HOSTS }} - if_key_exists: replace - - - name: Update APT Cache - run: apt-get update -y - - - name: Set Build Config - run: cp -vf ./pika-build-config/i386.sh ./pika-build-config.sh - - - name: Build Package - run: ./main.sh - - - name: Release Package - run: ./release.sh diff --git a/.github/workflows/release-nesti386.yml b/.github/workflows/release-nesti386.yml deleted file mode 100644 index 126d643..0000000 --- a/.github/workflows/release-nesti386.yml +++ /dev/null @@ -1,40 +0,0 @@ -name: PikaOS Package Build & Release (i386) - -on: - push: - branches: - - main - paths: - - '.github/release-nest-i386' - -jobs: - build: - runs-on: ubuntu-latest - container: - image: ghcr.io/pikaos-linux/pikaos-builder:nesti386 - volumes: - - /proc:/proc - options: --privileged -it - - steps: - - uses: actions/checkout@v3 - - - name: Install SSH key - uses: shimataro/ssh-key-action@v2 - with: - key: ${{ secrets.SSH_KEY }} - name: id_rsa - known_hosts: ${{ secrets.KNOWN_HOSTS }} - if_key_exists: replace - - - name: Update APT Cache - run: apt-get update -y - - - name: Set Build Config - run: cp -vf ./pika-build-config/i386.sh ./pika-build-config.sh - - - name: Build Package - run: ./main.sh - - - name: Release Package - run: ./release.sh diff --git a/debian/15_nvidia_gbm.json b/debian/15_nvidia_gbm.json new file mode 100644 index 0000000..2654beb --- /dev/null +++ b/debian/15_nvidia_gbm.json @@ -0,0 +1,6 @@ +{ + "file_format_version" : "1.0.0", + "ICD" : { + "library_path" : "libnvidia-egl-gbm.so.1" + } +} diff --git a/debian/changelog b/debian/changelog old mode 100644 new mode 100755 index 6d8d068..17571c1 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -upstream-name (1.0-101pika1) pika; urgency=medium +nvidia-egl-gbm (1.1.1.git1-101pika1) pika; urgency=medium - * Initial release. (Closes: #nnnn) + * git release - -- ferreo Wed, 18 Jan 2023 21:48:14 +0000 + -- Andreas Beckmann Tue, 09 Jan 2024 11:29:14 +0100 diff --git a/debian/control b/debian/control index 0bcd8e0..0cae78c 100644 --- a/debian/control +++ b/debian/control @@ -1,19 +1,28 @@ -Source: upstream-name -Section: admin +Source: nvidia-egl-gbm +Section: contrib/libs Priority: optional -Maintainer: name -Standards-Version: 4.6.1 -Build-Depends: debhelper-compat (= 13) +Maintainer: Debian NVIDIA Maintainers +Uploaders: + Andreas Beckmann , +Build-Depends: + debhelper-compat (= 13), + eglexternalplatform-dev (>= 1.1), + eglexternalplatform-dev (<< 2), + libdrm-dev (>= 2.4.75), + libegl-dev, + libgbm-dev (>= 21.2), + meson (>= 0.50), + pkg-config, +Standards-Version: 4.6.2 +Homepage: https://github.com/NVIDIA/egl-gbm +Vcs-Browser: https://salsa.debian.org/nvidia-team/nvidia-egl-gbm +Vcs-Git: https://salsa.debian.org/nvidia-team/nvidia-egl-gbm.git Rules-Requires-Root: no -Package: pkgname1 -Architecture: linux-any -# Delete any of these lines if un-used -Depends: ${misc:Depends}, depends -Recommends: high priority optdepends -Conflicts: conflicts -Suggests: low priority optdepends -Breaks: also conflicts!? -Provides: provides -# -Description: pkgdesc +Package: libnvidia-egl-gbm1 +Architecture: amd64 i386 arm64 ppc64el +Multi-Arch: same +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: GBM EGL external platform library for NVIDIA + This library provides GBM EGL application support when using the NVIDIA + driver. diff --git a/debian/copyright b/debian/copyright index e69de29..fb4a88c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -0,0 +1,42 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: egl-gbm +Source: https://github.com/NVIDIA/egl-gbm +Disclaimer: + This package is not part of the GNU/Linux Debian distribution. It is + provided in the contrib archive area as a convenience to Debian users. + The contents of this source package are freely licensed under the Expat + license, but it is only useful in combination with the proprietary + NVIDIA drivers in non-free. + +Files: * +Copyright: (c) 2014-2021 NVIDIA CORPORATION. All rights reserved. +License: Expat + +Files: external/* +Copyright: © 2011 Intel Corporation + © 2021 NVIDIA Corporation +License: Expat + +Files: debian/* +Copyright: + © 2022-2024 Andreas Beckmann +License: Expat + +License: Expat + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..781ccc2 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,3 @@ +[DEFAULT] +debian-branch = main +upstream-tag = %(version)s diff --git a/debian/libnvidia-egl-gbm1.install b/debian/libnvidia-egl-gbm1.install new file mode 100644 index 0000000..97ccd10 --- /dev/null +++ b/debian/libnvidia-egl-gbm1.install @@ -0,0 +1,2 @@ +usr/lib/*/libnvidia-egl-gbm.so* +debian/15_nvidia_gbm.json usr/share/egl/egl_external_platform.d/ diff --git a/debian/rules b/debian/rules index 64a084a..4ff373a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,67 +1,8 @@ -#! /usr/bin/make -f +#!/usr/bin/make -f -## See debhelper(7) (uncomment to enable). -## Output every command that modifies files on the build system. -export DH_VERBOSE = 1 -export PIKA_BUILD_ARCH = $(shell cat ../pika-build-arch) - -## === the chain of command === -## debuild runs a chain of dh functions in the following order: -## dh_testdir -## dh_clean -## dh_auto_clean -## dh_update_autotools_config -## dh_autoreconf -## dh_auto_configure -## dh_prep -## dh_build -## dh_auto_build -## dh_install -## dh_auto_install -## dh_installdocs -## dh_installchangelogs -## dh_perl -## dh_link -## dh_strip_nondeterminism -## dh_compress -## dh_fixperms -## dh_missing -## dh_dwz -## dh_strip -## dh_makeshlibs -## dh_shlibdeps -## dh_installdeb -## dh_gencontrol -## but you are most likely to only need to override the following: -## dh_clean -## dh_auto_configure -## dh_build -## dh_install - -## === End end of region === - -## === overriding dh functions === -## by default all dh functions will run a specific command based on the build system selected by "dh $@" -## if you have a makefile that does everything you need this is fine, -## but most likely you have no MakeFile and you want to add your own commands -## Note : overrides must be places above %: -## So here's a few examples: - -## overriding dh_clean to make it not delete rust vendor files: -#override_dh_clean: -# echo "disabled" - -## overriding dh_auto_configure to add custom configs: -#override_dh_auto_configure: -# $(srcdir)/configure -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_DATADIR=/usr/share -DCMAKE_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu -DBUILD_PLUGIN=OFF - -## overriding dh_install to install files to a package: -#override_dh_auto_configure: -# mkdir -p debian/pikman/usr/bin -# cp pikman debian/pikman/usr/bin/ - -## === End end of region === - -## This here will start the build: %: - dh $@ + dh $@ --without single-binary + +# for debhelper-compat (<< 15) +override_dh_auto_install: + dh_auto_install --destdir=debian/tmp diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..edb1456 --- /dev/null +++ b/debian/watch @@ -0,0 +1,5 @@ +version=4 + +opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE@-$1.tar.gz%" \ + https://github.com/NVIDIA/egl-gbm/tags \ + (?:.*?/)?v?(\d[\d.]*)\.tar\.gz diff --git a/main.sh b/main.sh index d80ca48..4f9eb04 100755 --- a/main.sh +++ b/main.sh @@ -2,22 +2,24 @@ set -e -. ./pika-build-config.sh +VERSION="1.1.1.git1" + +source ./pika-build-config.sh echo "$PIKA_BUILD_ARCH" > pika-build-arch -VERSION="1.0" - # Clone Upstream -mkdir -p ./src-pkg-name -cp -rvf ./debian ./src-pkg-name/ -cd ./src-pkg-name/ +#git clone https://github.com/NVIDIA/egl-gbm -b "$VERSION" +git clone https://github.com/NVIDIA/egl-gbm ./nvidia-egl-gbm +cp -rvf ./debian ./nvidia-egl-gbm +cd ./nvidia-egl-gbm +#for i in $(cat ../patches/series) ; do echo "Applying Patch: $i" && patch -Np1 -i ../patches/$i || bash -c "echo "Applying Patch $i Failed!" && exit 2"; done # Get build deps -LOGNAME=root dh_make --createorig -y -l -p src-pkg-name_"$VERSION" || echo "dh-make: Ignoring Last Error" apt-get build-dep ./ -y # Build package +LOGNAME=root dh_make --createorig -y -l -p nvidia-egl-gbm_"$VERSION" || echo "dh-make: Ignoring Last Error" dpkg-buildpackage --no-sign # Move the debs to output diff --git a/release.sh b/release.sh index 2b121d4..660f48f 100755 --- a/release.sh +++ b/release.sh @@ -1,3 +1,2 @@ # send debs to server rsync -azP --include './' --include '*.deb' --exclude '*' ./output/ ferreo@direct.pika-os.com:/srv/www/cockatiel-incoming/ -