From patchwork Mon Aug 8 17:36:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_G=C3=B6ttsche?= X-Patchwork-Id: 12938932 X-Patchwork-Delegate: jason@perfinion.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D2CAAC00140 for ; Mon, 8 Aug 2022 17:37:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243330AbiHHRhG (ORCPT ); Mon, 8 Aug 2022 13:37:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40158 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230034AbiHHRhD (ORCPT ); Mon, 8 Aug 2022 13:37:03 -0400 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4BBAF13E91 for ; Mon, 8 Aug 2022 10:37:01 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id m4so17906877ejr.3 for ; Mon, 08 Aug 2022 10:37:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc; bh=zZ1SfGtJgmwMBhmPKnIvfw8X6bxjX7HYMd96E5iOjO8=; b=JT/ZmnyJrXmVNFjGLSXWW4pU9Ajgw5t9eticA1BeZh2UywsFPrSYu8q75VbgP53kMd ieSr8ePX1LNs5tfqLs3tqAauUx7bWiMOMLtJiaWVOn3nAF7NuAoYUlhM+HHe7Eqzrnd5 e6w28HDG+10nV0HaY0/r5ZbYBTP6a9OYK7rN0mVnMGxZ9d6lABeOrUwNE0W5lvG2mBva 2U3lG2+qaCYFSKg6hetFAMM71ETSS/Fk1ETYxKEKe/TM+Z5zTDnOY/68/4BNDU4ZojB+ GtWBpuJFPus8ssk+m9QPmun1p0Va3R3t47B3j9dUNvS2+EnUWZHLLO1G6FvxS/eI+wAR 5Vig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc; bh=zZ1SfGtJgmwMBhmPKnIvfw8X6bxjX7HYMd96E5iOjO8=; b=ma4ctUkOd20dzV5i9WZC3KOpKQn62e5X480TrjQfL/mptrj/KzlDD1osMcMGnvLJK3 3XESOI9p2N3q3FKED1skJjjQMQg/jh5ITnoaMlHfnaigJtx/edyMZn5MY+yi+xZmZsI/ 3PA/KebA0LNI/XdG//a778VdTMHGG83WgzePlxi450jvMOoMTOxfx4DJg8d9pTAreU38 VqcGwt51Q5CGjZ79yUnMv1A0LFXp9/9njmt7T9naaG9/6uhqwKSPhjnHSVGQZasHrro7 CcvEo67c8iMbL0OPrGZog6iY1iVcUxWVmTWG7AGNpB1FtxtnkSpfkpWU8gmImbYWRTva pC5w== X-Gm-Message-State: ACgBeo1fcZIfT34yQk3AgxJsetDxhS7qqPps7ays/fagD0Cz3cpRA8d4 HDD9yKyM1v4TYRbe7KGvEzwMCa9ouDY= X-Google-Smtp-Source: AA6agR4mtiKhWT05SONwcP47jsWi7sWhaawX3rVHLrUNB5GL1qtrmn3SnPiYQPs+rAsDeT1xS81rcA== X-Received: by 2002:a17:907:3ea7:b0:730:9a8b:b8f1 with SMTP id hs39-20020a1709073ea700b007309a8bb8f1mr14927875ejc.168.1659980219722; Mon, 08 Aug 2022 10:36:59 -0700 (PDT) Received: from debianHome.localdomain (dynamic-077-000-248-038.77.0.pool.telefonica.de. [77.0.248.38]) by smtp.gmail.com with ESMTPSA id es25-20020a056402381900b0043a61f6c389sm4851900edb.4.2022.08.08.10.36.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Aug 2022 10:36:59 -0700 (PDT) From: =?utf-8?q?Christian_G=C3=B6ttsche?= To: selinux@vger.kernel.org Subject: [PATCH 1/4] ci: bump versions in GitHub Actions Date: Mon, 8 Aug 2022 19:36:52 +0200 Message-Id: <20220808173655.16867-1-cgzones@googlemail.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org * Move from deprecated actions/setup-ruby to ruby/setup-ruby. * Bump python and ruby upper versions. * Bump Reference Policy version * Do not install recommend packages and output package resolution * Bump to macOS 12 macOS 10 is deprecated since 5/31/22 [1]. VirtualBox and Vagrant seems to be supported [2][3]. [1]: https://github.com/actions/virtual-environments/issues/5583 [2]: https://github.com/actions/virtual-environments/pull/5594 [3]: https://github.com/actions/virtual-environments/pull/5854 Signed-off-by: Christian Göttsche Acked-by: James Carter --- .github/workflows/run_tests.yml | 62 +++++++++++++++++------------- .github/workflows/vm_testsuite.yml | 5 +-- 2 files changed, 38 insertions(+), 29 deletions(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 8b7cb720..db0e1af5 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -10,48 +10,51 @@ jobs: matrix: compiler: [gcc, clang] python-ruby-version: - - {python: 3.9, ruby: 2.7} - - {python: 3.9, ruby: 2.7, other: test-flags-override} - - {python: 3.9, ruby: 2.7, other: test-debug} - - {python: 3.9, ruby: 2.7, other: linker-bfd} - - {python: 3.9, ruby: 2.7, other: linker-gold} + - {python: '3.10', ruby: '3.1'} + - {python: '3.10', ruby: '3.1', other: test-flags-override} + - {python: '3.10', ruby: '3.1', other: test-debug} + - {python: '3.10', ruby: '3.1', other: linker-bfd} + - {python: '3.10', ruby: '3.1', other: linker-gold} # Test several Python versions with the latest Ruby version - - {python: 3.8, ruby: 2.7} - - {python: 3.7, ruby: 2.7} - - {python: 3.6, ruby: 2.7} - - {python: 3.5, ruby: 2.7} - - {python: pypy3, ruby: 2.7} + - {python: '3.9', ruby: '3.1'} + - {python: '3.8', ruby: '3.1'} + - {python: '3.7', ruby: '3.1'} + - {python: '3.6', ruby: '3.1'} + - {python: '3.5', ruby: '3.1'} + - {python: 'pypy3.7', ruby: '3.1'} # Test several Ruby versions with the latest Python version - - {python: 3.9, ruby: 2.6} - - {python: 3.9, ruby: 2.5} + - {python: '3.10', ruby: '3.0'} + - {python: '3.10', ruby: '2.7'} + - {python: '3.10', ruby: '2.6'} + - {python: '3.10', ruby: '2.5'} exclude: - compiler: clang - python-ruby-version: {python: 3.9, ruby: 2.7, other: linker-bfd} + python-ruby-version: {python: '3.10', ruby: '3.1', other: linker-bfd} - compiler: clang - python-ruby-version: {python: 3.9, ruby: 2.7, other: linker-gold} + python-ruby-version: {python: '3.10', ruby: '3.1', other: linker-gold} include: - compiler: gcc - python-ruby-version: {python: 3.9, ruby: 2.7, other: sanitizers} + python-ruby-version: {python: '3.10', ruby: '3.1', other: sanitizers} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-ruby-version.python }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-ruby-version.python }} - name: Set up Ruby ${{ matrix.python-ruby-version.ruby }} - uses: actions/setup-ruby@v1 + uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.python-ruby-version.ruby }} + bundler-cache: true - name: Install dependencies run: | - sudo apt-get update -qq - sudo apt-get install -qqy \ + sudo apt-get update -q + sudo apt-get install -qy --no-install-recommends \ bison \ - clang \ flex \ gawk \ gettext \ @@ -61,14 +64,16 @@ jobs: libcunit1-dev \ libdbus-glib-1-dev \ libpcre2-dev \ - python3-dev \ - python-dev \ ruby-dev \ swig \ xmlto pip install flake8 + - name: Install Clang + if: ${{ matrix.compiler == 'clang' }} + run: sudo apt-get install -qqy clang + - name: Configure the environment run: | DESTDIR=/tmp/destdir @@ -82,6 +87,11 @@ jobs: elif [ "${{ matrix.python-ruby-version.other }}" = "linker-gold" ] ; then CC="$CC -fuse-ld=gold" fi + # https://bugs.ruby-lang.org/issues/18616 + # https://github.com/llvm/llvm-project/issues/49958 + if [ "${{ matrix.compiler }}" = "clang" ] && [[ "${{ matrix.python-ruby-version.ruby }}" = 3* ]] ; then + CC="$CC -fdeclspec" + fi echo "CC=$CC" >> $GITHUB_ENV EXPLICIT_MAKE_VARS= @@ -110,7 +120,7 @@ jobs: PYTHON_SYS_PREFIX="$(python -c 'import sys;print(sys.prefix)')" echo "PKG_CONFIG_PATH=${PYTHON_SYS_PREFIX}/lib/pkgconfig" >> $GITHUB_ENV - if [ "${{ matrix.python-ruby-version.python }}" = "pypy3" ] ; then + if [[ "${{ matrix.python-ruby-version.python }}" = pypy* ]] ; then # PyPy does not provide a config file for pkg-config # libpypy-c.so is provided in bin/libpypy-c.so for PyPy and bin/libpypy3-c.so for PyPy3 echo "PYINC=-I${PYTHON_SYS_PREFIX}/include" >> $GITHUB_ENV @@ -122,10 +132,10 @@ jobs: - name: Download and install refpolicy headers for sepolgen tests run: | - curl --location --retry 10 -o refpolicy.tar.bz2 https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 + curl --location --retry 10 -o refpolicy.tar.bz2 https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20220520/refpolicy-2.20220520.tar.bz2 tar -xvjf refpolicy.tar.bz2 sed -e "s,^PREFIX :=.*,PREFIX := $DESTDIR/usr," -i refpolicy/support/Makefile.devel - sudo make -C refpolicy install-headers clean + sudo make -C refpolicy install-headers bare sudo mkdir -p /etc/selinux echo 'SELINUXTYPE=refpolicy' | sudo tee /etc/selinux/config echo 'SELINUX_DEVEL_PATH = /usr/share/selinux/refpolicy' | sudo tee /etc/selinux/sepolgen.conf diff --git a/.github/workflows/vm_testsuite.yml b/.github/workflows/vm_testsuite.yml index 601276dd..92155da2 100644 --- a/.github/workflows/vm_testsuite.yml +++ b/.github/workflows/vm_testsuite.yml @@ -6,11 +6,10 @@ jobs: vm_testsuite: # Use VirtualBox+vagrant on macOS, as described in https://github.com/actions/virtual-environments/issues/433 - # Use an old version of macOS until https://github.com/actions/virtual-environments/pull/4010 is merged. - runs-on: macos-10.15 + runs-on: macos-12 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Create Vagrant VM run: | From patchwork Mon Aug 8 17:36:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_G=C3=B6ttsche?= X-Patchwork-Id: 12938933 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 658F2C25B0C for ; Mon, 8 Aug 2022 17:37:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230034AbiHHRhH (ORCPT ); Mon, 8 Aug 2022 13:37:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40162 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237287AbiHHRhE (ORCPT ); Mon, 8 Aug 2022 13:37:04 -0400 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D2D8913F7E for ; Mon, 8 Aug 2022 10:37:01 -0700 (PDT) Received: by mail-ej1-x635.google.com with SMTP id gk3so17857133ejb.8 for ; Mon, 08 Aug 2022 10:37:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=PMplhifgaOttKG7Qk7foOBtpQFhet1VGhNnwTKtfZV4=; b=apz/eogb6ql5DyhDtLqj5HXLeRvlW7PmEQmXWrTm0NLpPRW+I6EbqTWe3ydXB51+oc LucvWNVR/dDPJxFZiP4GSmI3k825pBxwHEKFK6j2rawJsXOaMKkUpxdUxk5d/pv93AsH BwkxMBzM7/R6L/GXwoiXzd43YTXuQlrY6g8kdCVOMNZRcd6tjyGJavpWBo4tVEhmHN// nMwfVajMNexBTbAVj8Wt5jqxxtWf073aymqIBQA8omzZeE4nlMxYC1b0i061nlWO+Glq grT73e2sSRzuWl5VfqlKjGdqWUzXroXrhI2XlrRv7j1WBD6SZbokZvYcyb3xW7hBHJbI b4rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=PMplhifgaOttKG7Qk7foOBtpQFhet1VGhNnwTKtfZV4=; b=NzRCNjQir81pAi2f15zrX3QRm94gleIUbLObeaLiNtPX5/+redx2qPXDHH6aZvFsUx ReSLcdh4l6hNcTlFKdegC6I8WIhE81/vz4JeJ85LHpkArELaJHYJEhQrDQCFdkFerVwl fE+x1E0McZ9xuxoAcO9EC0gbs1rwcQX7LoalM5vdIMsCemd7pix0KDYqqVuSvG6aC8TD 9F8tpTgurtBuODNYNO3bTW5/u3EXRF13aFDf0lmIX1iltJlvgRtGZAPXv+EEhHRqH4kH 5BuXouudFgm/4I0XWhJiNbsUZhwVld/llijCAnRN/3vvC8s9vE30s6m5zOI6BwHO4AdZ Hnog== X-Gm-Message-State: ACgBeo0NgQ09BRHIR2YVqr5wNolxBVgvvyv3HdQoHryTMFu0JshIKw0e 8GTUJHabByG9/TWFEAG0+NZIhbEySqw= X-Google-Smtp-Source: AA6agR4a0klH0J12GosaTcovOZ58Gdv+wnw3PQuszlMxIYD+ChZLVsnbviMD0wYnxweO44wS/xrFdw== X-Received: by 2002:a17:907:968e:b0:730:bc30:da2f with SMTP id hd14-20020a170907968e00b00730bc30da2fmr14724264ejc.484.1659980220373; Mon, 08 Aug 2022 10:37:00 -0700 (PDT) Received: from debianHome.localdomain (dynamic-077-000-248-038.77.0.pool.telefonica.de. [77.0.248.38]) by smtp.gmail.com with ESMTPSA id es25-20020a056402381900b0043a61f6c389sm4851900edb.4.2022.08.08.10.36.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Aug 2022 10:36:59 -0700 (PDT) From: =?utf-8?q?Christian_G=C3=B6ttsche?= To: selinux@vger.kernel.org Subject: [PATCH 2/4] scripts/ci: use F36 image instead of F34 Date: Mon, 8 Aug 2022 19:36:53 +0200 Message-Id: <20220808173655.16867-2-cgzones@googlemail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220808173655.16867-1-cgzones@googlemail.com> References: <20220808173655.16867-1-cgzones@googlemail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org Signed-off-by: Christian Göttsche --- scripts/ci/Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/Vagrantfile b/scripts/ci/Vagrantfile index 20c523a0..b6023367 100644 --- a/scripts/ci/Vagrantfile +++ b/scripts/ci/Vagrantfile @@ -34,7 +34,7 @@ SCRIPT # backwards compatibility). Please don't change it unless you know what # you're doing. Vagrant.configure("2") do |config| - config.vm.box = "fedora/34-cloud-base" + config.vm.box = "fedora/36-cloud-base" config.vm.synced_folder "../..", "/root/selinux" config.vm.provider "virtualbox" do |v| From patchwork Mon Aug 8 17:36:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_G=C3=B6ttsche?= X-Patchwork-Id: 12938935 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8767FC25B08 for ; Mon, 8 Aug 2022 17:37:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237287AbiHHRhI (ORCPT ); Mon, 8 Aug 2022 13:37:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40164 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242984AbiHHRhE (ORCPT ); Mon, 8 Aug 2022 13:37:04 -0400 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E90B213E8B for ; Mon, 8 Aug 2022 10:37:02 -0700 (PDT) Received: by mail-ej1-x62f.google.com with SMTP id gb36so17847569ejc.10 for ; Mon, 08 Aug 2022 10:37:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=+SQLaRXNkRgvTh8+/lJgnMERAvNcJs9FJBTusKHFKZA=; b=b2e8ML4djVTHb6Em8flHNKi1uS5+Go2QX34i/0GIC0wfkzqZ6JUrI1NAVlvcpM24fh 2255PDgzbdKa0mCWjZxUJMgFjxPQZarCL0MTBlyvlHlMckk5HjniLW64RI2lIGL0RGoy SbJsYYSw6DVS3fkdNr4cn59aSOdyNMjNAJipNGaYxhFtQdQeTuqaWQQkfrOl4didzD7A Qud7NWadf7CcSiBOQHCh8r2+4O1y/jA90WkQXqwiz4zAljwAumT4KQ8M42MPPw7ph34P N+sG3hrtnrRECVAoEZeYmyn/aZc7hBuhdh8fh5KwEtM5IRXA47hxmyGzyNTQyRE+54aq VBzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=+SQLaRXNkRgvTh8+/lJgnMERAvNcJs9FJBTusKHFKZA=; b=3M4/RaEI4dK2p6pvWD3FhBi1BxfzxLrpBqGG9TcLSsEDlgrHLCWzqSt1A5mKuzysjp mVhY1fKXGfYGlHArrrVWp7I6hFyiENAn3fH8DpqkgiBcpyXbBR6fYNoRVTkh5tq4CvP+ VTz/hVfNxYm1MoQ/A2960CzHSHuHD2N8h3uC4yCvsTvZCiQKPwfPS5lLfhjYku8y1C/Z TuKW9G+7aKQD6A0D1ibPh2qBWqbkyqLNFHQnofH0hruS5/4euDq0hcu4+c445XwQSOL0 c/FA1+a2kLRUKvWBaPNJeu+os9US5cr4IeDMYWhyYpc+LGBMcCKZ45/tGTtHGouEbdxu oqeA== X-Gm-Message-State: ACgBeo333SOqWqu28pdNJN+zbZRCAoS72gK89JH6ybLVpDEnzFw8tScO LYWL8m+AHlxApzAvd1Pr2AxH/GaLV34= X-Google-Smtp-Source: AA6agR6lz2RUMkDIGvmn3IIGdq4kuO8kTc7FxDmtROASyFTRdVnYq105CS2eXBTzAS9Lf4MOt4pvWw== X-Received: by 2002:a17:906:9749:b0:730:aaee:30e2 with SMTP id o9-20020a170906974900b00730aaee30e2mr13894282ejy.248.1659980221489; Mon, 08 Aug 2022 10:37:01 -0700 (PDT) Received: from debianHome.localdomain (dynamic-077-000-248-038.77.0.pool.telefonica.de. [77.0.248.38]) by smtp.gmail.com with ESMTPSA id es25-20020a056402381900b0043a61f6c389sm4851900edb.4.2022.08.08.10.37.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Aug 2022 10:37:00 -0700 (PDT) From: =?utf-8?q?Christian_G=C3=B6ttsche?= To: selinux@vger.kernel.org Subject: [PATCH 3/4] scripts: ignore Flake8 tag E275 Date: Mon, 8 Aug 2022 19:36:54 +0200 Message-Id: <20220808173655.16867-3-cgzones@googlemail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220808173655.16867-1-cgzones@googlemail.com> References: <20220808173655.16867-1-cgzones@googlemail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org ./gui/polgengui.py:484:18: E275 missing whitespace after keyword ./gui/polgengui.py:530:18: E275 missing whitespace after keyword ./python/sepolgen/src/sepolgen/policygen.py:327:19: E275 missing whitespace after keyword ./python/sepolgen/src/sepolgen/policygen.py:329:11: E275 missing whitespace after keyword ./python/sepolicy/build/lib/sepolicy/__init__.py:453:15: E275 missing whitespace after keyword ./python/sepolicy/build/lib/sepolicy/generate.py:1349:28: E275 missing whitespace after keyword ./python/sepolicy/build/lib/sepolicy/generate.py:1351:28: E275 missing whitespace after keyword ./python/sepolicy/build/lib/sepolicy/gui.py:638:24: E275 missing whitespace after keyword ./python/sepolicy/build/lib/sepolicy/gui.py:863:23: E275 missing whitespace after keyword ./python/sepolicy/build/lib/sepolicy/gui.py:2177:16: E275 missing whitespace after keyword ./python/sepolicy/sepolicy/__init__.py:453:15: E275 missing whitespace after keyword ./python/sepolicy/sepolicy/generate.py:1349:28: E275 missing whitespace after keyword ./python/sepolicy/sepolicy/generate.py:1351:28: E275 missing whitespace after keyword ./python/sepolicy/sepolicy/gui.py:638:24: E275 missing whitespace after keyword ./python/sepolicy/sepolicy/gui.py:863:23: E275 missing whitespace after keyword ./python/sepolicy/sepolicy/gui.py:2177:16: E275 missing whitespace after keyword ./sandbox/sandbox:114:7: E275 missing whitespace after keyword ./sandbox/sandbox:134:11: E275 missing whitespace after keyword ./sandbox/sandbox:136:7: E275 missing whitespace after keyword Signed-off-by: Christian Göttsche --- scripts/run-flake8 | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/run-flake8 b/scripts/run-flake8 index 67cccfe9..ad15f3d4 100755 --- a/scripts/run-flake8 +++ b/scripts/run-flake8 @@ -58,6 +58,7 @@ IGNORE_LIST="$IGNORE_LIST,E261" # at least two spaces before inline comment IGNORE_LIST="$IGNORE_LIST,E265" # block comment should start with '# ' IGNORE_LIST="$IGNORE_LIST,E266" # too many leading '#' for block comment IGNORE_LIST="$IGNORE_LIST,E272" # multiple spaces before keyword +IGNORE_LIST="$IGNORE_LIST,E275" # missing whitespace after keyword IGNORE_LIST="$IGNORE_LIST,E301" # expected 1 blank line, found 0 IGNORE_LIST="$IGNORE_LIST,E302" # expected 2 blank lines, found 1 IGNORE_LIST="$IGNORE_LIST,E303" # too many blank lines From patchwork Mon Aug 8 17:36:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_G=C3=B6ttsche?= X-Patchwork-Id: 12938934 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21519C3F6B0 for ; Mon, 8 Aug 2022 17:37:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242984AbiHHRhI (ORCPT ); Mon, 8 Aug 2022 13:37:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236004AbiHHRhG (ORCPT ); Mon, 8 Aug 2022 13:37:06 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B87D4140B5 for ; Mon, 8 Aug 2022 10:37:03 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id kb8so17908919ejc.4 for ; Mon, 08 Aug 2022 10:37:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=q2QMLo0GZQ/LpQ00Gynk/V5qQy3diQPKRJdbhRTfjco=; b=b2LOx9u6fI4Hla0zM1Yv4ZbDravAKyemfkyO+/+CVnuLaRXO0StQeCPveCXk/5X91H xs++mXwnmlFWi1PIsFI572lw61X/8X5Ds/dr2SZMudvgFLHt++s/gKUrK/2LSubteiQ/ 73PTNK41UiHUfId7aN6Pyda9wsyq91zhyx/R2XnRPc+HmGrWYJ2cx0n7vImDMpZme7Lu AMjZNkiatgNZV8SB6UtdKXS9KPoijSqJOW8sh4xBgR8bVfRZILxLjEw0utv08KXpOPFw iuGlgV3UJorrUrnpkihoavf38z6bn6viFnFPy+9gUVYhXlBDzagKAEjp2Sa9/9Bw99if tYvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=q2QMLo0GZQ/LpQ00Gynk/V5qQy3diQPKRJdbhRTfjco=; b=xTjzOX3nClZ10MEuW+Tr35DMtXfYumlewVZPC8kNWhZ4ogPp0XWofb3oE9d3JT1Cor f4fRX9mIcCClRuYyD6gHYM7EV6EtVhSqnfOwkI5iYjJ6MOk/6hslV+k4JH7cPP5d+C4+ UdvO/t9NBGaKc2ST5T792dytykGxqwKvvalTCnSay0SB9kUM4FVC/9hhYB0yKE01fLO0 uNtKEbYu5YEyV9Ot7DHsyYK9/g+qaYPSHOdTNymF6OQ9ZyEghY0L4DEcoWHrYIZOtptD c4Knh3qYJu0nMiz3RBojkyHNQk48sco5vg1ntjmovl6r0dZZ4gKanwnxRva7xjw5/LYJ H5cA== X-Gm-Message-State: ACgBeo2IIcfCpHiF7+yxfCoUeLcTe/p6n/kdseibBnAECztCKzEQW+jR c7MplC7D9DeClH+i2+qLYfFN94Ig39g= X-Google-Smtp-Source: AA6agR5+7Mn/ijSmpAQYfTOQdYaGDYaCVUqNczbCEJ3Ttkt2k0gvhyyZsXbDw4bVzVMKDNr6h+SvgA== X-Received: by 2002:a17:907:7b92:b0:72b:67fb:8985 with SMTP id ne18-20020a1709077b9200b0072b67fb8985mr14093555ejc.569.1659980222214; Mon, 08 Aug 2022 10:37:02 -0700 (PDT) Received: from debianHome.localdomain (dynamic-077-000-248-038.77.0.pool.telefonica.de. [77.0.248.38]) by smtp.gmail.com with ESMTPSA id es25-20020a056402381900b0043a61f6c389sm4851900edb.4.2022.08.08.10.37.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Aug 2022 10:37:01 -0700 (PDT) From: =?utf-8?q?Christian_G=C3=B6ttsche?= To: selinux@vger.kernel.org Subject: [PATCH 4/4] Ignore egg-info directories and clean them Date: Mon, 8 Aug 2022 19:36:55 +0200 Message-Id: <20220808173655.16867-4-cgzones@googlemail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220808173655.16867-1-cgzones@googlemail.com> References: <20220808173655.16867-1-cgzones@googlemail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org Test .gitignore and make clean distclean error: missing .gitignore entry for libselinux/src/selinux.egg-info/ error: missing .gitignore entry for python/sepolicy/sepolicy.egg-info/ Error: Process completed with exit code 1. error: "make clean distclean" did not remove libselinux/src/selinux.egg-info/PKG-INFO error: "make clean distclean" did not remove libselinux/src/selinux.egg-info/SOURCES.txt error: "make clean distclean" did not remove libselinux/src/selinux.egg-info/dependency_links.txt error: "make clean distclean" did not remove libselinux/src/selinux.egg-info/top_level.txt error: "make clean distclean" did not remove python/sepolicy/sepolicy.egg-info/PKG-INFO error: "make clean distclean" did not remove python/sepolicy/sepolicy.egg-info/SOURCES.txt error: "make clean distclean" did not remove python/sepolicy/sepolicy.egg-info/dependency_links.txt error: "make clean distclean" did not remove python/sepolicy/sepolicy.egg-info/top_level.txt Error: Process completed with exit code 1. Signed-off-by: Christian Göttsche --- libselinux/src/.gitignore | 1 + libselinux/src/Makefile | 2 +- python/sepolicy/.gitignore | 1 + python/sepolicy/Makefile | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libselinux/src/.gitignore b/libselinux/src/.gitignore index 001f20b0..94400e81 100644 --- a/libselinux/src/.gitignore +++ b/libselinux/src/.gitignore @@ -1,3 +1,4 @@ selinux.py selinuxswig_python_wrap.c selinuxswig_ruby_wrap.c +selinux.egg-info/ diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile index 88aa32f8..49b7d60a 100644 --- a/libselinux/src/Makefile +++ b/libselinux/src/Makefile @@ -201,7 +201,7 @@ relabel: clean-pywrap: -rm -f $(SWIGLOBJ) $(SWIGSO) $(AUDIT2WHYLOBJ) $(AUDIT2WHYSO) $(PYTHON) setup.py clean - -rm -rf build *~ \#* *pyc .#* + -rm -rf build *~ \#* *pyc .#* selinux.egg-info/ clean-rubywrap: -rm -f $(SWIGRUBYLOBJ) $(SWIGRUBYSO) diff --git a/python/sepolicy/.gitignore b/python/sepolicy/.gitignore index 3186c860..32fb47f9 100644 --- a/python/sepolicy/.gitignore +++ b/python/sepolicy/.gitignore @@ -1,3 +1,4 @@ build tmp *.bak +sepolicy.egg-info/ diff --git a/python/sepolicy/Makefile b/python/sepolicy/Makefile index 3361be4e..d983e409 100644 --- a/python/sepolicy/Makefile +++ b/python/sepolicy/Makefile @@ -18,7 +18,7 @@ python-build: clean: $(PYTHON) setup.py clean - -rm -rf build *~ \#* *pyc .#* + -rm -rf build *~ \#* *pyc .#* sepolicy.egg-info/ sepolgen: ln -sf sepolicy sepolgen