From 4f0ecbca4b94fd46ee9ec9e36b1715acee42744f Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 20 Aug 2018 12:05:36 +0200 Subject: [PATCH 1/7] hdf5: Strip trailing space --- hdf5-1.8.5_patch1-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hdf5-1.8.5_patch1-0.bee b/hdf5-1.8.5_patch1-0.bee index 3d4975772..42cd4a4b5 100755 --- a/hdf5-1.8.5_patch1-0.bee +++ b/hdf5-1.8.5_patch1-0.bee @@ -15,7 +15,7 @@ mee_patch() { } mee_configure() { - bee_configure + bee_configure } mee_build() { From e858d41c5f8f8dd58474e10fd48fe248e844e247 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 20 Aug 2018 12:05:43 +0200 Subject: [PATCH 2/7] hdf5: Securely download source archive over HTTPS --- hdf5-1.8.5_patch1-0.bee | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hdf5-1.8.5_patch1-0.bee b/hdf5-1.8.5_patch1-0.bee index 42cd4a4b5..2d2607757 100755 --- a/hdf5-1.8.5_patch1-0.bee +++ b/hdf5-1.8.5_patch1-0.bee @@ -1,6 +1,4 @@ -#!/bin/env beesh - -SRCURL[0]="http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.8.5-patch1.tar.bz2" +SRCURL[0]="https://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.8.5-patch1.tar.bz2" PATCHURL[0]="" From 8aba3ae20035412ed31737e877ffeacf78f92a22 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 20 Aug 2018 12:06:15 +0200 Subject: [PATCH 3/7] hdf5: Remove blank line at end of file --- hdf5-1.8.5_patch1-0.bee | 1 - 1 file changed, 1 deletion(-) diff --git a/hdf5-1.8.5_patch1-0.bee b/hdf5-1.8.5_patch1-0.bee index 2d2607757..736c3bc31 100755 --- a/hdf5-1.8.5_patch1-0.bee +++ b/hdf5-1.8.5_patch1-0.bee @@ -23,4 +23,3 @@ mee_build() { mee_install() { bee_install } - From a472ae900136320d5fdc23e868bcd8fa488e2b9e Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 20 Aug 2018 12:07:34 +0200 Subject: [PATCH 4/7] hdf5: Rebuild bee file with current template $ bee init -f https://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.8.5-patch1.tar.bz2 creating hdf5-1.8.5-patch1-0-0.bee from template '/etc/default/bee/templates/fallback' $ mv hdf5-1.8.5-patch1-0-0.bee hdf5-1.8.5_patch1-0.bee --- hdf5-1.8.5_patch1-0.bee | 90 +++++++++++++++++++++++++++++++++-------- 1 file changed, 74 insertions(+), 16 deletions(-) diff --git a/hdf5-1.8.5_patch1-0.bee b/hdf5-1.8.5_patch1-0.bee index 736c3bc31..99b4f4c2c 100755 --- a/hdf5-1.8.5_patch1-0.bee +++ b/hdf5-1.8.5_patch1-0.bee @@ -1,25 +1,83 @@ +#!/usr/bin/env beesh + +## 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.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.8.5-patch1.tar.bz2" -PATCHURL[0]="" +############################################################################### +## 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 + -PGRP=( uncategorized ) +############################################################################### +## 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}" -# BEE_CONFIGURE=compat +#mee_extract() { +# bee_extract "${@}" +#} -# EXCLUDE="" +#mee_patch() { +# bee_patch "${@}" +#} -mee_patch() { - bee_patch -} +#mee_configure() { +# bee_configure +#} -mee_configure() { - bee_configure -} +#mee_build() { +# bee_build +#} -mee_build() { - bee_build -} +#mee_install() { +# bee_install +#} +## by default this may be 'make install DESTDIR="${D}"' -mee_install() { - bee_install -} +############################################################################### +## +## 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[${PKGVERSION}] 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 c649ec1fad5e3e8792296bdfed4bd611a991f827 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 20 Aug 2018 12:09:24 +0200 Subject: [PATCH 5/7] hdf5: Convert to versionless bee file --- hdf5-1.8.5_patch1-0.bee => hdf5.be0 | 2 ++ 1 file changed, 2 insertions(+) rename hdf5-1.8.5_patch1-0.bee => hdf5.be0 (98%) diff --git a/hdf5-1.8.5_patch1-0.bee b/hdf5.be0 similarity index 98% rename from hdf5-1.8.5_patch1-0.bee rename to hdf5.be0 index 99b4f4c2c..d87456a8e 100755 --- a/hdf5-1.8.5_patch1-0.bee +++ b/hdf5.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION hdf5-1.8.5_patch1-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.) From f0007e3ade0caaca56aeceb3be271a0a64e99edf Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 20 Aug 2018 12:11:33 +0200 Subject: [PATCH 6/7] hdf5: Update version from 1.8.5 to 1.10.1 [The change-log is available online.][1] [1]: https://support.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.10.1-RELEASE.txt --- hdf5.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hdf5.be0 b/hdf5.be0 index d87456a8e..a57fcdb6e 100755 --- a/hdf5.be0 +++ b/hdf5.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION hdf5-1.8.5_patch1-0 +# BEE_VERSION hdf5-1.10.1-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.) @@ -9,7 +9,7 @@ ## 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.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.8.5-patch1.tar.bz2" +SRCURL[0]="https://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.10.1.tar.bz2" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From 947adfe39081588cd42dc34606845446e75f07ff Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 20 Aug 2018 12:13:04 +0200 Subject: [PATCH 7/7] hdf5: Use bee variable `PKGVERSION` --- hdf5.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hdf5.be0 b/hdf5.be0 index a57fcdb6e..baa56c00a 100755 --- a/hdf5.be0 +++ b/hdf5.be0 @@ -9,7 +9,7 @@ ## 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.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.10.1.tar.bz2" +SRCURL[0]="https://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-${PKGVERSION}.tar.bz2" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array.