talkatu/builders

Move the fedora images to using the basic meson build instead of building packages

19 months ago, Gary Kramlich
013e945e0652
Parents 3cb1c9b37c33
Children 913b06183840
Move the fedora images to using the basic meson build instead of building packages
3 files changed, 2 insertions(+), 44 deletions(-)
  • +1 -1
    Dockerfile.fedora-36-amd64
  • +1 -1
    Dockerfile.fedora-rawhide-amd64
  • +0 -42
    rpm/build.sh
    • --- a/Dockerfile.fedora-36-amd64 Sat Sep 17 21:41:30 2022 -0500
    +++ b/Dockerfile.fedora-36-amd64 Sat Sep 17 21:42:04 2022 -0500
    @@ -26,5 +26,5 @@
    ENV TARGET=fedora-rawhide-amd64
    -COPY rpm/build.sh /build.sh
    +COPY meson/build.sh /build.sh
    --- a/Dockerfile.fedora-rawhide-amd64 Sat Sep 17 21:41:30 2022 -0500
    +++ b/Dockerfile.fedora-rawhide-amd64 Sat Sep 17 21:42:04 2022 -0500
    @@ -26,5 +26,5 @@
    ENV TARGET=fedora-rawhide-amd64
    -COPY rpm/build.sh /build.sh
    +COPY meson/build.sh /build.sh
    --- a/rpm/build.sh Sat Sep 17 21:41:30 2022 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,42 +0,0 @@
    -#!/bin/sh -ex
    -# Copyright (C) 2015-2016 Gary Kramlich <grim@reaperworld.com>
    -#
    -# This program is free software; you can redistribute it and/or modify
    -# it under the terms of the GNU General Public License as published by
    -# the Free Software Foundation; either version 3 of the License, or
    -# (at your option) any later version.
    -#
    -# This program is distributed in the hope that it will be useful,
    -# but WITHOUT ANY WARRANTY; without even the implied warranty of
    -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    -# GNU General Public License for more details.
    -#
    -# You should have received a copy of the GNU General Public License
    -# along with this program; if not, write to the Free Software Foundation,
    -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
    -
    -cd ${CONVEY_WORKSPACE}
    -
    -ARTIFACTS_DIR=${CONVEY_WORKSPACE}/${TARGET}
    -mkdir -p ${ARTIFACTS_DIR}
    -
    -BUILD_NUMBER="${BUILD_NUMBER:-0}"
    -BUILD_VERSION="${BUILD_NUMBER}~$(hg id -i)"
    -BUILD_DIR="build-${TARGET}"
    -
    -# we need to generate the spec file so we need to run meson
    -meson /tmp/${TARGET}
    -
    -set +e
    -# now that we have our rpm spec file we can do an rpmbuild
    -rpmbuild -bb \
    - -D "_rpmdir ${ARTIFACTS_DIR}" \
    - -D "_builddir ${CONVEY_WORKSPACE}" \
    - -D "_vpath_builddir ${BUILD_DIR}" \
    - -D "build_number ${BUILD_VERSION}" \
    - /tmp/${TARGET}/packaging/talkatu.spec
    -EC=${?}
    -set -e
    -
    -exit "${EC}"
    -