From 26bfae41b84959719611cfb9641b0c49960552e1 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 20 Jun 2016 17:46:56 +0200 Subject: [PATCH 1/2] bash-completion: Add version 2.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit > Programmable completion functions for bash [1] ``` > bee init https://github.com/scop/bash-completion/releases/download/2.3/bash-completion-2.3.tar.xz creating bash-completion-2.3-0.bee from template '/etc/default/bee/templates/fallback' ``` There is a conflict with the package `util-linux`. ``` […] [BEE] -> saving bee-file bash-completion-2.3-0.bee .. [BEE] /src/mariux/beeroot/bee-files/bash-completion-2.3-0.bee ‘/home/pmenzel/bee-files/./bash-completion-2.3-0.bee’ -> ‘/src/mariux/beeroot/bee-files/bash-completion-2.3-0.bee’ [BEE] Conflicts with installed package found: util-linux-2.28-0.x86_64: [BEE] /usr/share/bash-completion/completions/mount [BEE] /usr/share/bash-completion/completions/umount [BEE] -> saving build environment.. [BEE] /src/mariux/beeroot/build-archives/bash-completion-2.3-0.x86_64.beebuild.tar.bz2 […] ``` [1] https://github.com/scop/bash-completion --- bash-completion-2.3-0.bee | 83 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100755 bash-completion-2.3-0.bee diff --git a/bash-completion-2.3-0.bee b/bash-completion-2.3-0.bee new file mode 100755 index 000000000..b67ef10f2 --- /dev/null +++ b/bash-completion-2.3-0.bee @@ -0,0 +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://github.com/scop/bash-completion/releases/download/${PKGVERSION}/bash-completion-${PKGVERSION}.tar.xz" + +############################################################################### +## 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 build +## outside the source directory and need to be build 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 d17f7ef5b9b45956e2eba57a5a79d49a5b9ea3ee Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Fri, 8 Jul 2016 14:24:12 +0200 Subject: [PATCH 2/2] bash-completion-2.3-1: remove scripts conflicting with util-linux /usr/share/bash-completion/completions/mount and /usr/share/bash-completion/completions/umount would conflict with files with the same name (and apparently function) from util-linux-2.28-0 rebuild with new revision number and switch to versionless bee file --- bash-completion-2.3-0.bee => bash-completion-0.bee | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) rename bash-completion-2.3-0.bee => bash-completion-0.bee (93%) diff --git a/bash-completion-2.3-0.bee b/bash-completion-0.bee similarity index 93% rename from bash-completion-2.3-0.bee rename to bash-completion-0.bee index b67ef10f2..5a9e1bb31 100755 --- a/bash-completion-2.3-0.bee +++ b/bash-completion-0.bee @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +bee_version bash-completion-2.3-1 + ## 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.) @@ -59,9 +61,12 @@ SRCURL[0]="https://github.com/scop/bash-completion/releases/download/${PKGVERSIO # bee_build #} -#mee_install() { -# bee_install -#} +mee_install() { + bee_install + + rm $D/$PREFIX/share/bash-completion/completions/mount + rm $D/$PREFIX/share/bash-completion/completions/umount +} # by default this may be 'make install DESTDIR="${D}"' ###############################################################################