From 18756b909712908507095e619fcb6d11c7a656fb Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 6 Nov 2019 14:32:15 +0100 Subject: [PATCH 1/2] bsdiff: Start from scratch (init,be0) --- bsdiff.be0 | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100755 bsdiff.be0 diff --git a/bsdiff.be0 b/bsdiff.be0 new file mode 100755 index 000000000..bceb00489 --- /dev/null +++ b/bsdiff.be0 @@ -0,0 +1,79 @@ +#!/usr/bin/env beesh + +# BEE_VERSION bsdiff-4.3-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.daemonology.net/bsdiff/bsdiff-${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+=() + +############################################################################### +## 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 fa3474eaebc915b5e4497b3c3fde1b06321b4047 Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 6 Nov 2019 14:36:23 +0100 Subject: [PATCH 2/2] bsdiff: Fix/circumvent makefile The Makefile would be best rewritten from scratch. (Maybe in the next release) --- bsdiff.be0 | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/bsdiff.be0 b/bsdiff.be0 index bceb00489..5f2f1cb7b 100755 --- a/bsdiff.be0 +++ b/bsdiff.be0 @@ -43,9 +43,9 @@ SRCURL[0]="https://www.daemonology.net/bsdiff/bsdiff-${PKGVERSION}.tar.gz" # bee_extract "${@}" #} -#mee_patch() { -# bee_patch "${@}" -#} +mee_patch() { + sed -e '/^\.ifndef/ s/^\.//' -e '/^\.endif/ s/^\.//' -i ${S}/Makefile +} #mee_configure() { # bee_configure @@ -55,9 +55,16 @@ SRCURL[0]="https://www.daemonology.net/bsdiff/bsdiff-${PKGVERSION}.tar.gz" # bee_build #} -#mee_install() { -# bee_install -#} +mee_install() { + mkdir -vp ${D}/usr/bin + cp -v ${B}/bsdiff ${D}/usr/bin + cp -v ${B}/bspatch ${D}/usr/bin + chmod -v 755 ${D}/usr/bin/* + mkdir -vp ${D}/usr/share/man/man1 + cp -v ${B}/bsdiff.1 ${D}/usr/share/man/man1 + cp -v ${B}/bspatch.1 ${D}/usr/share/man/man1 + chmod -v 644 ${D}/usr/share/man/man1/* +} ## by default this may be 'make install DESTDIR="${D}"' ###############################################################################