From 0c1edf4453e1a80c98851e5084cb1f94ff424d79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Tue, 10 Mar 2020 13:14:22 +0100 Subject: dev-util: add build user for laminar --- acct-group/build/build-0.ebuild | 5 +++ acct-user/build/build-0.ebuild | 12 +++++++ dev-util/laminar/files/laminar.init | 1 + dev-util/laminar/laminar-0.8-r1.ebuild | 55 -------------------------------- dev-util/laminar/laminar-0.8-r2.ebuild | 58 ++++++++++++++++++++++++++++++++++ 5 files changed, 76 insertions(+), 55 deletions(-) create mode 100644 acct-group/build/build-0.ebuild create mode 100644 acct-user/build/build-0.ebuild delete mode 100644 dev-util/laminar/laminar-0.8-r1.ebuild create mode 100644 dev-util/laminar/laminar-0.8-r2.ebuild diff --git a/acct-group/build/build-0.ebuild b/acct-group/build/build-0.ebuild new file mode 100644 index 0000000..e1a39c7 --- /dev/null +++ b/acct-group/build/build-0.ebuild @@ -0,0 +1,5 @@ +EAPI=7 + +inherit acct-group + +ACCT_GROUP_ID=220 diff --git a/acct-user/build/build-0.ebuild b/acct-user/build/build-0.ebuild new file mode 100644 index 0000000..60be59f --- /dev/null +++ b/acct-user/build/build-0.ebuild @@ -0,0 +1,12 @@ +EAPI=7 + +inherit acct-user + +DESCRIPTION="Build system user" + +ACCT_USER_ID=220 +ACCT_USER_HOME=/var/build +ACCT_USER_SHELL=/bin/sh +ACCT_USER_GROUPS=( build ) + +acct-user_add_deps diff --git a/dev-util/laminar/files/laminar.init b/dev-util/laminar/files/laminar.init index 46df2d9..f0a4658 100755 --- a/dev-util/laminar/files/laminar.init +++ b/dev-util/laminar/files/laminar.init @@ -7,4 +7,5 @@ command_background=yes pidfile=/var/run/laminar.pid start_stop_daemon_args="$(sed -n 's/^\([^#].*=.*\)/ -e \1/p' /etc/laminar.conf)" command_user=build +command_group=build error_logger=/usr/bin/logger diff --git a/dev-util/laminar/laminar-0.8-r1.ebuild b/dev-util/laminar/laminar-0.8-r1.ebuild deleted file mode 100644 index 55d16d9..0000000 --- a/dev-util/laminar/laminar-0.8-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="Lightweight and modular Continuous Integration service for Linux" -HOMEPAGE="http://laminar.ohwg.net/" -SRC_URI="https://github.com/ohwgiles/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - https://cdnjs.cloudflare.com/ajax/libs/vue/2.3.4/vue.min.js -> ${P}-vue.min.js - https://cdnjs.cloudflare.com/ajax/libs/vue-router/2.7.0/vue-router.min.js -> ${P}-vue-router.min.js - https://raw.githubusercontent.com/drudru/ansi_up/v1.3.0/ansi_up.js -> ${P}-ansi_up.js - https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.min.js -> ${P}-Chart.min.js - https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css -> ${P}-bootstrap.min.css" - -LICENSE="" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=" - dev-libs/capnproto - dev-libs/rapidjson - dev-db/sqlite - dev-libs/boost" -RDEPEND="${DEPEND}" - -src_unpack() { - # Note that ${A} contains also other files so no general unpack - unpack "${P}.tar.gz" -} - -# Note: lamianr build system in default downloads external files but that is not -# possible for some reason in sandbox. This downloads those files outside of -# scripts and copies them to correct place before configure which prevents from -# download happening/failing. -src_configure() { - local BUILD_DIR="${WORKDIR}/${P}_build" - mkdir -p ${BUILD_DIR}/js - for file in vue.min.js vue-router.min.js ansi_up.js Chart.min.js; do - cat "${DISTDIR}/${P}-${file}" > "${BUILD_DIR}/js/${file}" - done - mkdir -p ${BUILD_DIR}/css - for file in bootstrap.min.css; do - cat "${DISTDIR}/${P}-${file}" > "${BUILD_DIR}/css/${file}" - done - - local mycmakeargs=( - "-DCMAKE_INSTALL_PREFIX=/" - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - newinitd "${FILESDIR}/laminar.init" laminar -} diff --git a/dev-util/laminar/laminar-0.8-r2.ebuild b/dev-util/laminar/laminar-0.8-r2.ebuild new file mode 100644 index 0000000..479ed3b --- /dev/null +++ b/dev-util/laminar/laminar-0.8-r2.ebuild @@ -0,0 +1,58 @@ +EAPI=6 + +inherit cmake-utils + +DESCRIPTION="Lightweight and modular Continuous Integration service for Linux" +HOMEPAGE="http://laminar.ohwg.net/" +SRC_URI="https://github.com/ohwgiles/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz + https://cdnjs.cloudflare.com/ajax/libs/vue/2.3.4/vue.min.js -> ${P}-vue.min.js + https://cdnjs.cloudflare.com/ajax/libs/vue-router/2.7.0/vue-router.min.js -> ${P}-vue-router.min.js + https://raw.githubusercontent.com/drudru/ansi_up/v1.3.0/ansi_up.js -> ${P}-ansi_up.js + https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.min.js -> ${P}-Chart.min.js + https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css -> ${P}-bootstrap.min.css" + +LICENSE="" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + dev-libs/capnproto + dev-libs/rapidjson + dev-db/sqlite + dev-libs/boost +" +RDEPEND="${DEPEND} + acct-user/build +" + +src_unpack() { + # Note that ${A} contains also other files so no general unpack + unpack "${P}.tar.gz" +} + +# Note: lamianr build system in default downloads external files but that is not +# possible for some reason in sandbox. This downloads those files outside of +# scripts and copies them to correct place before configure which prevents from +# download happening/failing. +src_configure() { + local BUILD_DIR="${WORKDIR}/${P}_build" + mkdir -p ${BUILD_DIR}/js + for file in vue.min.js vue-router.min.js ansi_up.js Chart.min.js; do + cat "${DISTDIR}/${P}-${file}" > "${BUILD_DIR}/js/${file}" + done + mkdir -p ${BUILD_DIR}/css + for file in bootstrap.min.css; do + cat "${DISTDIR}/${P}-${file}" > "${BUILD_DIR}/css/${file}" + done + + local mycmakeargs=( + "-DCMAKE_INSTALL_PREFIX=/" + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + newinitd "${FILESDIR}/laminar.init" laminar +} -- cgit v1.2.3