From 069e457857ba73c5a3409411ea99135a6eec756e Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sun, 7 May 2017 14:20:07 +0200 Subject: [PATCH 1/6] mcelog: Strip trailing space --- mcelog-0_0a6fcbd-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcelog-0_0a6fcbd-0.bee b/mcelog-0_0a6fcbd-0.bee index 1e5728691..a51b6dd59 100755 --- a/mcelog-0_0a6fcbd-0.bee +++ b/mcelog-0_0a6fcbd-0.bee @@ -23,7 +23,7 @@ PATCHURL[${PKGVERSION}]="" #} #mee_configure() { -# bee_configure +# bee_configure #} #mee_build() { From a3ba4201b85cac7d9a0c0bae128b19d02ff62f43 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sun, 7 May 2017 14:21:03 +0200 Subject: [PATCH 2/6] mcelog: Correct wrong substitution of `bee init` --- mcelog-0_0a6fcbd-0.bee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mcelog-0_0a6fcbd-0.bee b/mcelog-0_0a6fcbd-0.bee index a51b6dd59..ea20ba80b 100755 --- a/mcelog-0_0a6fcbd-0.bee +++ b/mcelog-0_0a6fcbd-0.bee @@ -1,8 +1,8 @@ #!/usr/bin/env beesh -SRCURL[${PKGVERSION}]="/home/mariux/.local/share/beeroot/downloads/mcelog-${PKGVERSION}_${PKGVERSION}a6fcbd.tar.bz2" +SRCURL[0]="/home/mariux/.local/share/beeroot/downloads/mcelog-${PKGVERSION}_${PKGVERSION}a6fcbd.tar.bz2" -PATCHURL[${PKGVERSION}]="" +PATCHURL[0]="" # BEE_CONFIGURE=compat From ddb584252a91869ab8817bbd8d124338d7a8d0f7 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sun, 7 May 2017 14:21:53 +0200 Subject: [PATCH 3/6] mcelog: Convert to versionless bee file --- mcelog-0_0a6fcbd-0.bee => mcelog.be0 | 2 ++ 1 file changed, 2 insertions(+) rename mcelog-0_0a6fcbd-0.bee => mcelog.be0 (93%) diff --git a/mcelog-0_0a6fcbd-0.bee b/mcelog.be0 similarity index 93% rename from mcelog-0_0a6fcbd-0.bee rename to mcelog.be0 index ea20ba80b..1862f0f6b 100755 --- a/mcelog-0_0a6fcbd-0.bee +++ b/mcelog.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION mcelog-0_0a6fcbd-0 + SRCURL[0]="/home/mariux/.local/share/beeroot/downloads/mcelog-${PKGVERSION}_${PKGVERSION}a6fcbd.tar.bz2" PATCHURL[0]="" From 03131fe8a5030c8f3a6e43f2657ad5770f24c9a4 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sun, 7 May 2017 14:23:04 +0200 Subject: [PATCH 4/6] mcelog: Update version from snapshot from 2012 to 149 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Please take a look at commits in the [mcelog git repository][1]. mcelog’s build system is able to install the needed files, so the bee install function doesn’t need to be overridden. [1]: https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git/ --- mcelog.be0 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mcelog.be0 b/mcelog.be0 index 1862f0f6b..067e67b97 100755 --- a/mcelog.be0 +++ b/mcelog.be0 @@ -1,8 +1,8 @@ #!/usr/bin/env beesh -# BEE_VERSION mcelog-0_0a6fcbd-0 +# BEE_VERSION mcelog-149-0 -SRCURL[0]="/home/mariux/.local/share/beeroot/downloads/mcelog-${PKGVERSION}_${PKGVERSION}a6fcbd.tar.bz2" +SRCURL[0]="https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git/snapshot/mcelog-${PKGVERSION}.tar.gz" PATCHURL[0]="" @@ -32,6 +32,6 @@ PATCHURL[0]="" # bee_build #} -mee_install() { - start_cmd make install prefix=${D}${PREFIX} etcprefix=${D} -} +#mee_install() { +# bee_install +#} From 37fef84ffe3a0805be711375e6370b77f7d4947c Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sun, 7 May 2017 14:24:07 +0200 Subject: [PATCH 5/6] mcelog: Recreate bee file Run `bee init` on the source URL. --- mcelog.be0 | 60 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 54 insertions(+), 6 deletions(-) diff --git a/mcelog.be0 b/mcelog.be0 index 067e67b97..440e9dc9a 100755 --- a/mcelog.be0 +++ b/mcelog.be0 @@ -2,26 +2,55 @@ # BEE_VERSION mcelog-149-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://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git/snapshot/mcelog-${PKGVERSION}.tar.gz" -PATCHURL[0]="" +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. + +# PATCHURL+=() -# BEE_CONFIGURE=compat +############################################################################### +## 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. -# BEE_BUILDTYPE= +# EXCLUDE+=() -# 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 ${@} +# bee_extract "${@}" #} #mee_patch() { -# bee_patch ${@} +# bee_patch "${@}" #} #mee_configure() { @@ -35,3 +64,22 @@ PATCHURL[0]="" #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 0f3688424231ec96886491517648f08a87b28df9 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sun, 7 May 2017 14:37:26 +0200 Subject: [PATCH 6/6] mcelog: Install systemd service unit Start mcelog during boot by systemd. The unit still needs to be enabled though with `systemctl enable mcelog`. --- mcelog.be0 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mcelog.be0 b/mcelog.be0 index 440e9dc9a..adcdbe839 100755 --- a/mcelog.be0 +++ b/mcelog.be0 @@ -61,9 +61,11 @@ SRCURL[0]="https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git/snapshot/mcel # bee_build #} -#mee_install() { -# bee_install -#} +mee_install() { + bee_install + install -v -m755 -d ${D}/lib/systemd/system + start_cmd install -v -m644 ${S}/mcelog.service ${D}/lib/systemd/system +} ## by default this may be 'make install DESTDIR="${D}"' ###############################################################################