From 3d786233e25a42201feda77adaff54e250270127 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 12 Sep 2017 17:51:27 +0200 Subject: [PATCH 1/2] haproxy: Add version 1.7.9 Description [1]: > HAProxy is a free, very fast and reliable solution offering high > availability, load balancing, and proxying for TCP and HTTP-based > applications. It is particularly suited for very high traffic web > sites and powers quite a number of the world's most visited ones. Over > the years it has become the de-facto standard opensource load > balancer, is now shipped with most mainstream Linux distributions, and > is often deployed by default in cloud platforms. Since it does not > advertise itself, we only know it's used when the admins report it :-) Create the versionless bee file with the commands below. ``` $ bee init https://www.haproxy.org/download/1.7/src/haproxy-1.7.9.tar.gz creating haproxy-1.7.9-0.bee from template '/etc/default/bee/templates/fallback' $ git add haproxy-1.7.9-0.bee $ git mv haproxy-1.7.9-0.bee haproxy.be0 $ vim haproxy.be0 ``` --- haproxy.be0 | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100755 haproxy.be0 diff --git a/haproxy.be0 b/haproxy.be0 new file mode 100755 index 000000000..ddb4d86af --- /dev/null +++ b/haproxy.be0 @@ -0,0 +1,85 @@ +#!/usr/bin/env beesh + +# BEE_VERSION haproxy-1.7.9-0 + +## this file was created by bee init and should be executed to build a +## bee-package. (Additional hints are located at the end of this file.) + +############################################################################### +## The source URL(s) define the location of the sources that will be +## downloaded. Version variables may be used to simplify reuse of this bee-file. + +SRCURL[0]="https://www.haproxy.org/download/${PKGVERSION[2]}/src/haproxy-${PKGVERSION}.tar.gz" + +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. + +# PATCHURL+=() + +############################################################################### +## Add filename patterns to the EXCLUDE array of files that should not +## be added to you package but may be present in the image directory. + +# EXCLUDE+=() + +############################################################################### +## Uncomment the next statement, if the software may not be able to be built +## outside the source directory and needs to be built inside the source +## directory. + +# build_in_sourcedir + +############################################################################### +## bee cannot detect buildtypes specified in subdirectories. +## Sometimes packages "hide" the real sources in a subdirectory named +## 'src' or 'cmake' or .. +## use 'sourcesubdir_append' to specify this directory if known. + +# sourcesubdir_append src + + +############################################################################### +## Change the default (auto-detected) steps to +## extract, patch, configure/setup, build and install the software. +## Make sure the mee_install function does install everything to the +## image directory "${D}" + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +#mee_configure() { +# bee_configure +#} + +#mee_build() { +# bee_build +#} + +#mee_install() { +# bee_install +#} +## by default this may be 'make install DESTDIR="${D}"' + +############################################################################### +## +## Additional hints: +## +## The name of this bee-file should follow the following naming convention: +## pkgname-pkgversion-pkgrevision.bee +## +## You may remove all comments as long as SRCURL[0] is set. +## +## Everything in this file will be executed in a bash environment. +## +## Build the package by executing +## './pkg-version-N.bee' or +## 'beesh ./pkg-version-N.bee' +## +## see http://beezinga.org/ +## From 56f7bbc57edd9319fbff46259f2761c9382013ad Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 12 Sep 2017 17:57:25 +0200 Subject: [PATCH 2/2] haproxy: Specify build target ``` [BEE] make -j PREFIX=/usr EPREFIX=/usr BINDIR=/usr/bin SBINDIR=/usr/sbin LIBEXECDIR=/usr/libexec SYSCONFDIR=/etc SHAREDSTATEDIR=/var LOCALSTATEDIR=/var LIBDIR=/usr/lib INCLUDEDIR=/usr/include DATAROOTDIR=/usr/share DATADIR=/usr/share INFODIR=/usr/share/info LOCALEDIR=/usr/share/locale MANDIR=/usr/share/man DOCDIR=/usr/share/doc/haproxy Due to too many reports of suboptimized setups, building without specifying the target is no longer supported. Please specify the target OS in the TARGET variable, in the following form: make TARGET=xxx Please choose the target among the following supported list : linux2628, linux26, linux24, linux24e, linux22, solaris freebsd, openbsd, cygwin, custom, generic Use "generic" if you don't want any optimization, "custom" if you want to precisely tweak every option, or choose the target which matches your OS the most in order to gain the maximum performance out of it. Please check the Makefile in case of doubts. ``` From [1]: > - added a build target "linux2628" which is like linux26 but > automatically [1] https://permalink.gmane.org/gmane.comp.web.haproxy/8795 --- haproxy.be0 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/haproxy.be0 b/haproxy.be0 index ddb4d86af..b2ded16fb 100755 --- a/haproxy.be0 +++ b/haproxy.be0 @@ -57,9 +57,9 @@ SRCURL[0]="https://www.haproxy.org/download/${PKGVERSION[2]}/src/haproxy-${PKGVE # bee_configure #} -#mee_build() { -# bee_build -#} +mee_build() { + bee_build TARGET=linux2628 +} #mee_install() { # bee_install