From 91ed49322aac60daa61b2297e2dd5d525f4e802c Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 3 Jul 2018 17:22:42 +0200 Subject: [PATCH 1/3] upower: Rebuild bee file with current template --- upower-0.9.16-1.bee | 54 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 4 deletions(-) diff --git a/upower-0.9.16-1.bee b/upower-0.9.16-1.bee index a1e830a61..c546a04a6 100755 --- a/upower-0.9.16-1.bee +++ b/upower-0.9.16-1.bee @@ -1,20 +1,47 @@ #!/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://upower.freedesktop.org/releases/upower-${PKGVERSION}.tar.xz" -PATCHURL[0]="" +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. -# BEE_CONFIGURE=compat +# PATCHURL+=() -# BEE_BUILDTYPE= +############################################################################### +## 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="" +# 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 "${@}" @@ -36,3 +63,22 @@ mee_configure() { #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 75aba303d3ff4eccc8c62a45d10da8266945c166 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 3 Jul 2018 17:24:05 +0200 Subject: [PATCH 2/3] upower: Convert to versionless bee file --- upower-0.9.16-1.bee => upower.be0 | 2 ++ 1 file changed, 2 insertions(+) rename upower-0.9.16-1.bee => upower.be0 (98%) diff --git a/upower-0.9.16-1.bee b/upower.be0 similarity index 98% rename from upower-0.9.16-1.bee rename to upower.be0 index c546a04a6..5556a8377 100755 --- a/upower-0.9.16-1.bee +++ b/upower.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION upower-0.9.16-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.) From d3acca6c305915f0454beb85375bf73866ba4fe8 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Tue, 3 Jul 2018 17:31:21 +0200 Subject: [PATCH 3/3] upower: Add patch to stop logging bind/unbind events Newer kernels emit bind and unbind events, which upowerd doesn't understand. Jul 03 16:19:54 theinternet.molgen.mpg.de upowerd[761]: unhandled action 'bind' on /sys/devices/pci0000:00/0000:00:14.0/usb3/3-8/3-8:1.0 Jul 03 16:19:54 theinternet.molgen.mpg.de upowerd[761]: unhandled action 'unbind' on /sys/devices/pci0000:00/0000:00:14.0/usb3/3-8/3-8:1.0 Jul 03 16:19:55 theinternet.molgen.mpg.de upowerd[761]: unhandled action 'bind' on /sys/devices/pci0000:00/0000:00:14.0/usb3/3-8/3-8:1.0 Jul 03 16:19:55 theinternet.molgen.mpg.de upowerd[761]: unhandled action 'unbind' on /sys/devices/pci0000:00/0000:00:14.0/usb3/3-8/3-8:1.0 Jul 03 16:19:55 theinternet.molgen.mpg.de upowerd[761]: unhandled action 'bind' on /sys/devices/pci0000:00/0000:00:14.0/usb3/3-8/3-8:1.0 This became a problem, when we tried to used `blink1-tool` in a loop. This could fill our log files. A patch to make upowerd less chatty on newer kernels has been sent to its development mailing list and committed to its master development branch [1] [2]. Apply this patch as a backport. [1] https://bugs.freedesktop.org/show_bug.cgi?id=106019 [2] https://cgit.freedesktop.org/upower/commit/?id=40e525edbde41f24f53a3a5255fbace71c79261a --- upower.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/upower.be0 b/upower.be0 index 5556a8377..4d1d658a3 100755 --- a/upower.be0 +++ b/upower.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION upower-0.9.16-1 +# BEE_VERSION upower-0.9.16-2 ## 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.) @@ -15,7 +15,7 @@ SRCURL[0]="https://upower.freedesktop.org/releases/upower-${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+=() +PATCHURL+=(https://bugs.freedesktop.org/attachment.cgi?id=138815) ############################################################################### ## Add filename patterns to the EXCLUDE array of files that should not