libical: upgrade to 3.0.6
PATCH 1/4 libical: upgrade to 3.0.6
---
.../libical/{libical_3.0.5.bb => libical_3.0.6.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/libical/{libical_3.0.5.bb => libical_3.0.6.bb} (90%)meta/recipes-support/libical/libical_3.0.6.bb renamed from meta/recipes-support/libical/libical_3.0.5.bb +2 -2
@@ -9,8 +9,8 @@ SECTION = "libs" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz" -SRC_URI[md5sum] = "9be4e8a1739a9c27e06aa8ce66b8cb34" -SRC_URI[sha256sum] = "7ad550c8c49c9b9983658e3ab3e68b1eee2439ec17b169a6b1e6ecb5274e78e6" +SRC_URI[md5sum] = "463a59244c6767b8e67b29379405e297" +SRC_URI[sha256sum] = "5c8a21c2b732ece4a33e5c862970b4f35a8548bbcda50de5695f6fc211ac4d97" UPSTREAM_CHECK_URI = "https://github.com/libical/libical/releases" inherit cmake pkgconfig
Signature · 1 line
2.20.1
PATCH 2/4 distcc: clean up the UI install logic
Remove the local copy of the desktop file, instead apply a patch from upstream to fix the file. This also fixes the install paths, so update the recipe.
Remove glibc-specific installation as this was due to uclibc failures.
Refresh and submit upstream the out-of-tree build fix.
--- meta/recipes-devtools/distcc/distcc_3.3.3.bb | 13 +- .../distcc/files/distccmon-gnome.desktop | 12 -- .../distcc/files/fix-gnome.patch | 122 ++++++++++++++++++ .../distcc/files/separatebuilddir.patch | 42 +++--- 4 files changed, 154 insertions(+), 35 deletions(-) delete mode 100644 meta/recipes-devtools/distcc/files/distccmon-gnome.desktop create mode 100644 meta/recipes-devtools/distcc/files/fix-gnome.patch
meta/recipes-devtools/distcc/distcc_3.3.3.bb +5 -8
@@ -15,9 +15,9 @@ PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt" RRECOMMENDS_${PN} = "avahi-daemon" SRC_URI = "git://github.com/distcc/distcc.git \ + file://fix-gnome.patch \ file://separatebuilddir.patch \ file://default \ - file://distccmon-gnome.desktop \ file://distcc \ file://distcc.service" SRCREV = "4cde9bcfbda589abd842e3bbc652ce369085eaae"
@@ -51,13 +51,8 @@ do_install() { install -d ${D}${systemd_unitdir}/system/ install -m 0644 ${WORKDIR}/distcc.service ${D}${systemd_unitdir}/system sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_unitdir}/system/distcc.service - ${DESKTOPINSTALL} -} -DESKTOPINSTALL = "" -DESKTOPINSTALL_libc-glibc () { - install -d ${D}${datadir}/distcc/ - install -m 0644 ${WORKDIR}/distccmon-gnome.desktop ${D}${datadir}/distcc/ } + PACKAGES += "distcc-distmon-gnome" FILES_${PN} = " ${sysconfdir} \
@@ -67,8 +62,10 @@ FILES_${PN} = " ${sysconfdir} \ ${bindir}/distccmon-text \ ${sbindir}/update-distcc-symlinks \ ${systemd_unitdir}/system/distcc.service" + FILES_distcc-distmon-gnome = " ${bindir}/distccmon-gnome \ - ${datadir}/distcc" + ${datadir}/applications \ + ${datadir}/pixmaps" #
meta/recipes-devtools/distcc/files/distccmon-gnome.desktop deleted +0 -12
@@ -1,12 +0,0 @@ -[Desktop Entry] -Version=0.9.4 -Exec=distccmon-gnome -Name=distcc monitor -GenericName=Distributed Compile Monitor -Comment=Graphical view of distributed compile tasks -Icon=distccmon-gnome-icon -TryExec=distccmon-gnome -Terminal=false -Type=Application -Categories=GNOME;Development; -StartupNotify=true
meta/recipes-devtools/distcc/files/fix-gnome.patch new file +122 -0
122 lines not on this page · raw message
meta/recipes-devtools/distcc/files/separatebuilddir.patch +27 -15
48 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH 3/4 distcc: use --enable-tcp-insecure instead of --make-me-a-botnet
In reply to Ross Burton--make-me-a-botnet is worrying, --enable-tcp-insecure is clearer and doesn't
scare people glancing at 'ps'.
--- meta/recipes-devtools/distcc/files/default | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/distcc/files/default +1 -1
@@ -21,4 +21,4 @@ ALLOWEDNETS="127.0.0.1" # # OPTIONS is used for the systemd service file # -OPTIONS="--allow 127.0.0.1 --make-me-a-botnet" +OPTIONS="--allow 127.0.0.1 --enable-tcp-insecure"
Signature · 1 line
2.20.1
PATCH 4/4 distcc: split into client and server packages
In reply to Ross BurtonUsers of distcc are rarely both clients and servers, so split the package. distcc is the client, the new distcc-server package is the server.
--- meta/recipes-devtools/distcc/distcc_3.3.3.bb | 21 +++++++------------- 1 file changed, 7 insertions(+), 14 deletions(-)
meta/recipes-devtools/distcc/distcc_3.3.3.bb +7 -14
@@ -12,7 +12,7 @@ PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk --without-gnome,gtk+" # use system popt by default PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt" -RRECOMMENDS_${PN} = "avahi-daemon" +RRECOMMENDS_${PN}-server = "avahi-daemon" SRC_URI = "git://github.com/distcc/distcc.git \ file://fix-gnome.patch \
@@ -29,6 +29,8 @@ ASNEEDED = "" EXTRA_OECONF += "--disable-Werror PYTHON='' --disable-pump-mode" +PACKAGE_BEFORE_PN = "${PN}-distmon-gnome ${PN}-server" + USERADD_PACKAGES = "${PN}" USERADD_PARAM_${PN} = "--system \ --home /dev/null \
@@ -38,8 +40,8 @@ USERADD_PARAM_${PN} = "--system \ INITSCRIPT_NAME = "distcc" -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "distcc.service" +SYSTEMD_PACKAGES = "${PN}-server" +SYSTEMD_SERVICE_${PN}-server = "distcc.service" do_install() { # Improve reproducibility: compress w/o timestamps
@@ -53,17 +55,8 @@ do_install() { sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_unitdir}/system/distcc.service } -PACKAGES += "distcc-distmon-gnome" - -FILES_${PN} = " ${sysconfdir} \ - ${bindir}/distcc \ - ${bindir}/lsdistcc \ - ${bindir}/distccd \ - ${bindir}/distccmon-text \ - ${sbindir}/update-distcc-symlinks \ - ${systemd_unitdir}/system/distcc.service" - -FILES_distcc-distmon-gnome = " ${bindir}/distccmon-gnome \ +FILES_${PN}-server = "${bindir}/distccd ${sysconfdir} ${sbindir}" +FILES_${PN}-distmon-gnome = " ${bindir}/distccmon-gnome \ ${datadir}/applications \ ${datadir}/pixmaps"
Signature · 1 line
2.20.1