diff options
Diffstat (limited to 'meta/recipes-devtools/distcc')
| -rw-r--r-- | meta/recipes-devtools/distcc/distcc_3.4.bb (renamed from meta/recipes-devtools/distcc/distcc_3.3.3.bb) | 33 | ||||
| -rw-r--r-- | meta/recipes-devtools/distcc/files/fix-gnome.patch | 122 | ||||
| -rw-r--r-- | meta/recipes-devtools/distcc/files/separatebuilddir.patch | 33 |
3 files changed, 17 insertions, 171 deletions
diff --git a/meta/recipes-devtools/distcc/distcc_3.3.3.bb b/meta/recipes-devtools/distcc/distcc_3.4.bb index c52f136be8..ab138b3ab6 100644 --- a/meta/recipes-devtools/distcc/distcc_3.3.3.bb +++ b/meta/recipes-devtools/distcc/distcc_3.4.bb @@ -1,8 +1,9 @@ SUMMARY = "A parallel build system" DESCRIPTION = "distcc is a parallel build system that distributes \ compilation of C/C++/ObjC code across machines on a network." +HOMEPAGE = "https://github.com/distcc/distcc" SECTION = "devel" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "avahi binutils" @@ -12,16 +13,16 @@ 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}-server = "avahi-daemon" +RRECOMMENDS:${PN}-server = "avahi-daemon" -SRC_URI = "git://github.com/distcc/distcc.git \ - file://fix-gnome.patch \ - file://separatebuilddir.patch \ +SRC_URI = "git://github.com/distcc/distcc.git;branch=master;protocol=https \ file://default \ file://distcc \ - file://distcc.service" -SRCREV = "4cde9bcfbda589abd842e3bbc652ce369085eaae" + file://distcc.service \ + " +SRCREV = "50d821efe99cae82c05be0a4ab3b4035ef0d3883" S = "${WORKDIR}/git" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" inherit autotools pkgconfig update-rc.d useradd systemd @@ -32,7 +33,7 @@ EXTRA_OECONF += "--disable-Werror PYTHON='' --disable-pump-mode" PACKAGE_BEFORE_PN = "${PN}-distmon-gnome ${PN}-server" USERADD_PACKAGES = "${PN}-server" -USERADD_PARAM_${PN}-server = "--system \ +USERADD_PARAM:${PN}-server = "--system \ --home /dev/null \ --no-create-home \ --gid nogroup \ @@ -42,24 +43,24 @@ UPDATERCPN = "${PN}-server" INITSCRIPT_NAME = "distcc" SYSTEMD_PACKAGES = "${PN}-server" -SYSTEMD_SERVICE_${PN}-server = "distcc.service" +SYSTEMD_SERVICE:${PN}-server = "distcc.service" do_install() { # Improve reproducibility: compress w/o timestamps oe_runmake 'DESTDIR=${D}' "GZIP_BIN=gzip -n" install install -d ${D}${sysconfdir}/init.d/ install -d ${D}${sysconfdir}/default - install -m 0755 ${WORKDIR}/distcc ${D}${sysconfdir}/init.d/ - install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/distcc - 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 + install -m 0755 ${UNPACKDIR}/distcc ${D}${sysconfdir}/init.d/ + install -m 0755 ${UNPACKDIR}/default ${D}${sysconfdir}/default/distcc + install -d ${D}${systemd_system_unitdir}/ + install -m 0644 ${UNPACKDIR}/distcc.service ${D}${systemd_system_unitdir} + sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_system_unitdir}/distcc.service } -FILES_${PN}-server = "${sysconfdir} \ +FILES:${PN}-server = "${sysconfdir} \ ${bindir}/distccd \ ${sbindir}" -FILES_${PN}-distmon-gnome = "${bindir}/distccmon-gnome \ +FILES:${PN}-distmon-gnome = "${bindir}/distccmon-gnome \ ${datadir}/applications \ ${datadir}/pixmaps" diff --git a/meta/recipes-devtools/distcc/files/fix-gnome.patch b/meta/recipes-devtools/distcc/files/fix-gnome.patch deleted file mode 100644 index f1f5ed1a9f..0000000000 --- a/meta/recipes-devtools/distcc/files/fix-gnome.patch +++ /dev/null @@ -1,122 +0,0 @@ -Upstream-Status: Backport [https://github.com/distcc/distcc/pull/319] -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 2faacc2be8d7eeee0a3f66d88fedd1d3ab11070e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Sat, 8 Dec 2018 12:50:07 +0100 -Subject: [PATCH] Fix desktop spec compliance of distccmon-gnome install - -Update the .desktop file and install rules for distccmon-gnome to -conform to the freedesktop.org specifications. More specifically: - -- update to version 1.0 of the spec -- remove obsolete 'Encoding' key -- remove obsolete 'Application' category and add recommended 'GTK' -- install icon file to the correct directory -- strip suffix from desktop file (specifying it is deprecated) -- while at it, remove redundant '-icon' from the filename -- install desktop file to the correct directory ---- - Makefile.in | 18 ++++++++++-------- - gnome/distccmon-gnome.desktop | 7 +++---- - ...mon-gnome-icon.png => distccmon-gnome.png} | Bin - src/mon-gnome.c | 2 +- - 4 files changed, 14 insertions(+), 13 deletions(-) - rename gnome/{distccmon-gnome-icon.png => distccmon-gnome.png} (100%) - -diff --git a/Makefile.in b/Makefile.in -index 6e1e467..1106559 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -52,13 +52,14 @@ mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include - docdir = @docdir@ --pkgdatadir = $(datadir)/@PACKAGE_NAME@ -+icondir = $(datarootdir)/pixmaps -+desktopdir = $(datarootdir)/applications - - include_server_builddir = $(builddir)/_include_server - - # These must be done from here, not from autoconf, because they can - # contain variable expansions written in Make syntax. Ew. --DIR_DEFS = -DLIBDIR="\"${libdir}\"" -DSYSCONFDIR="\"${sysconfdir}\"" -DPKGDATADIR="\"${pkgdatadir}\"" -+DIR_DEFS = -DLIBDIR="\"${libdir}\"" -DSYSCONFDIR="\"${sysconfdir}\"" -DICONDIR="\"${icondir}\"" - - # arguments to pkgconfig - GNOME_PACKAGES = @GNOME_PACKAGES@ -@@ -387,7 +388,7 @@ man_HTML = man/distcc_1.html man/distccd_1.html man/distccmon_text_1.html \ - man/lsdistcc_1.html man/pump_1.html man/include_server_1.html - MEN = $(man1_MEN) - --gnome_data = gnome/distccmon-gnome-icon.png \ -+gnome_data = gnome/distccmon-gnome.png \ - gnome/distccmon-gnome.desktop - - popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \ -@@ -1033,7 +1034,8 @@ showpaths: - @echo " programs $(DESTDIR)$(bindir)" - @echo " sbin programs $(DESTDIR)$(sbindir)" - @echo " system configuration $(DESTDIR)$(sysconfdir)" -- @echo " shared data files $(DESTDIR)$(pkgdatadir)" -+ @echo " icon file $(DESTDIR)$(icondir)" -+ @echo " application file $(DESTDIR)$(desktopdir)" - - - # install-sh can't handle multiple arguments, but we don't need any -@@ -1129,10 +1131,10 @@ install-example: $(example_DOCS) - done - - install-gnome-data: $(gnome_data) -- $(mkinstalldirs) "$(DESTDIR)$(pkgdatadir)" -- for p in $(gnome_data); do \ -- $(INSTALL_DATA) "$$p" "$(DESTDIR)$(pkgdatadir)" || exit 1; \ -- done -+ $(mkinstalldirs) "$(DESTDIR)$(icondir)" -+ $(mkinstalldirs) "$(DESTDIR)$(desktopdir)" -+ $(INSTALL_DATA) gnome/distccmon-gnome.png "$(DESTDIR)$(icondir)" -+ $(INSTALL_DATA) gnome/distccmon-gnome.desktop "$(DESTDIR)$(desktopdir)" - - install-conf: $(conf_files) $(default_files) - $(mkinstalldirs) "$(DESTDIR)$(sysconfdir)/distcc" -diff --git a/gnome/distccmon-gnome.desktop b/gnome/distccmon-gnome.desktop -index bd1fa26..7205f5e 100644 ---- a/gnome/distccmon-gnome.desktop -+++ b/gnome/distccmon-gnome.desktop -@@ -1,6 +1,5 @@ - [Desktop Entry] --Version=0.9.4 --Encoding=UTF-8 -+Version=1.0 - Exec=distccmon-gnome - Name=distcc monitor - Name[sv]=distcc övervakare -@@ -8,9 +7,9 @@ GenericName=Distributed Compile Monitor - GenericName[sv]=Distribuerad kompilerings-övervakare - Comment=Graphical view of distributed compile tasks - Comment[sv]=Grafisk vy av distribuerade kompileringsuppgifter --Icon=distccmon-gnome-icon.png -+Icon=distccmon-gnome - TryExec=distccmon-gnome - Terminal=false - Type=Application --Categories=GNOME;Application;Development; -+Categories=GNOME;GTK;Development; - StartupNotify=true -diff --git a/gnome/distccmon-gnome-icon.png b/gnome/distccmon-gnome.png -similarity index 100% -rename from gnome/distccmon-gnome-icon.png -rename to gnome/distccmon-gnome.png -diff --git a/src/mon-gnome.c b/src/mon-gnome.c -index 24681d0..bfc286d 100644 ---- a/src/mon-gnome.c -+++ b/src/mon-gnome.c -@@ -599,7 +599,7 @@ static GtkWidget * dcc_gnome_make_mainwin (void) - - #if GTK_CHECK_VERSION(2,2,0) - gtk_window_set_icon_from_file (GTK_WINDOW (mainwin), -- PKGDATADIR "/distccmon-gnome-icon.png", -+ ICONDIR "/distccmon-gnome.png", - NULL); - #endif - diff --git a/meta/recipes-devtools/distcc/files/separatebuilddir.patch b/meta/recipes-devtools/distcc/files/separatebuilddir.patch deleted file mode 100644 index c8da9d51c3..0000000000 --- a/meta/recipes-devtools/distcc/files/separatebuilddir.patch +++ /dev/null @@ -1,33 +0,0 @@ -Upstream-Status: Backport [https://github.com/distcc/distcc/pull/363] -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 469628ee8dc90c7162d1a850c0b179b7349f9cf3 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Tue, 17 Sep 2019 13:04:22 +0100 -Subject: [PATCH] Makefile.in: fix out-of-tree builds when the GNOME UI is - enabled - -The install command doesn't use $(srcdir) so out-of-tree builds fail. - -Signed-off-by: Ross Burton <ross.burton@intel.com> ---- - Makefile.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 123054f..b9ce974 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -1130,8 +1130,8 @@ install-example: $(example_DOCS) - install-gnome-data: $(gnome_data) - $(mkinstalldirs) "$(DESTDIR)$(icondir)" - $(mkinstalldirs) "$(DESTDIR)$(desktopdir)" -- $(INSTALL_DATA) gnome/distccmon-gnome.png "$(DESTDIR)$(icondir)" -- $(INSTALL_DATA) gnome/distccmon-gnome.desktop "$(DESTDIR)$(desktopdir)" -+ $(INSTALL_DATA) $(srcdir)/gnome/distccmon-gnome.png "$(DESTDIR)$(icondir)" -+ $(INSTALL_DATA) $(srcdir)/gnome/distccmon-gnome.desktop "$(DESTDIR)$(desktopdir)" - - install-conf: $(conf_files) $(default_files) - $(mkinstalldirs) "$(DESTDIR)$(sysconfdir)/distcc" --- -2.20.1 |