diff options
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/networkmanager/files/gtk-doc.make | 173 | ||||
| -rw-r--r-- | recipes/networkmanager/network-manager-applet_git.bb | 27 | ||||
| -rwxr-xr-x | recipes/networkmanager/networkmanager/NetworkManager (renamed from recipes/networkmanager/networkmanager-0.7.1/NetworkManager) | 0 | ||||
| -rw-r--r-- | recipes/networkmanager/networkmanager/cx3110_bring_up.patch (renamed from recipes/networkmanager/networkmanager-0.7.1/cx3110_bring_up.patch) | 0 | ||||
| -rw-r--r-- | recipes/networkmanager/networkmanager/disable_wireless_by_default.patch (renamed from recipes/networkmanager/networkmanager-0.7.1/disable_wireless_by_default.patch) | 0 | ||||
| -rw-r--r-- | recipes/networkmanager/networkmanager/nm-system-settings.conf (renamed from recipes/networkmanager/networkmanager-0.7.1/nm-system-settings.conf) | 0 | ||||
| -rw-r--r-- | recipes/networkmanager/networkmanager_git.bb | 33 |
7 files changed, 233 insertions, 0 deletions
diff --git a/recipes/networkmanager/files/gtk-doc.make b/recipes/networkmanager/files/gtk-doc.make new file mode 100644 index 0000000000..354ffb7c66 --- /dev/null +++ b/recipes/networkmanager/files/gtk-doc.make @@ -0,0 +1,173 @@ +# -*- mode: makefile -*- + +#################################### +# Everything below here is generic # +#################################### + +if GTK_DOC_USE_LIBTOOL +GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +else +GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +endif + +# We set GPATH here; this gives us semantics for GNU make +# which are more like other make's VPATH, when it comes to +# whether a source that is a target of one rule is then +# searched for in VPATH/GPATH. +# +GPATH = $(srcdir) + +TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) + +EXTRA_DIST = \ + $(content_files) \ + $(HTML_IMAGES) \ + $(DOC_MAIN_SGML_FILE) \ + $(DOC_MODULE)-sections.txt \ + $(DOC_MODULE)-overrides.txt + +DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ + $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp + +SCANOBJ_FILES = \ + $(DOC_MODULE).args \ + $(DOC_MODULE).hierarchy \ + $(DOC_MODULE).interfaces \ + $(DOC_MODULE).prerequisites \ + $(DOC_MODULE).signals + +REPORT_FILES = \ + $(DOC_MODULE)-undocumented.txt \ + $(DOC_MODULE)-undeclared.txt \ + $(DOC_MODULE)-unused.txt + +CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) + +if ENABLE_GTK_DOC +all-local: html-build.stamp +else +all-local: +endif + +docs: html-build.stamp + +#### scan #### + +scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) + @echo 'gtk-doc: Scanning header files' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) + if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + else \ + cd $(srcdir) ; \ + for i in $(SCANOBJ_FILES) ; do \ + test -f $$i || touch $$i ; \ + done \ + fi + touch scan-build.stamp + +$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp + @true + +#### templates #### + +tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt + @echo 'gtk-doc: Rebuilding template files' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) + touch tmpl-build.stamp + +tmpl.stamp: tmpl-build.stamp + @true + +tmpl/*.sgml: + @true + + +#### xml #### + +sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) + @echo 'gtk-doc: Building XML' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && \ + gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) + touch sgml-build.stamp + +sgml.stamp: sgml-build.stamp + @true + +#### html #### + +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + @echo 'gtk-doc: Building HTML' + @-chmod -R u+w $(srcdir) + rm -rf $(srcdir)/html + mkdir $(srcdir)/html + cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo 'gtk-doc: Fixing cross-references' + cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + touch html-build.stamp + +############## + +clean-local: + rm -f *~ *.bak + rm -rf .libs + +distclean-local: + cd $(srcdir) && \ + rm -rf xml $(REPORT_FILES) \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + +maintainer-clean-local: clean + cd $(srcdir) && rm -rf xml html + +install-data-local: + -installfiles=`echo $(srcdir)/html/*`; \ + if test "$$installfiles" = '$(srcdir)/html/*'; \ + then echo '-- Nothing to install' ; \ + else \ + $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \ + for i in $$installfiles; do \ + echo '-- Installing '$$i ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ + done; \ + echo '-- Installing $(srcdir)/html/index.sgml' ; \ + $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ + which gtkdoc-rebase >/dev/null && \ + gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ + fi + + +uninstall-local: + rm -f $(DESTDIR)$(TARGET_DIR)/* + +# +# Require gtk-doc when making dist +# +if ENABLE_GTK_DOC +dist-check-gtkdoc: +else +dist-check-gtkdoc: + @echo "*** gtk-doc must be installed and enabled in order to make dist" + @false +endif + +dist-hook: dist-check-gtkdoc dist-hook-local + mkdir $(distdir)/tmpl + mkdir $(distdir)/xml + mkdir $(distdir)/html + -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl + -cp $(srcdir)/xml/*.xml $(distdir)/xml + cp $(srcdir)/html/* $(distdir)/html + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) + -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + +.PHONY : dist-hook-local docs diff --git a/recipes/networkmanager/network-manager-applet_git.bb b/recipes/networkmanager/network-manager-applet_git.bb new file mode 100644 index 0000000000..8b0d6fe9aa --- /dev/null +++ b/recipes/networkmanager/network-manager-applet_git.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "GTK+ applet for NetworkManager" +LICENSE = "GPL" +DEPENDS = "libnotify networkmanager dbus-glib libglade gconf gnome-keyring" +RDEPENDS = "networkmanager" + +DEFAULT_PREFERENCE = "-1" + +SRCREV = "efa170820623e7c1d6c161bfc8a37db0d074d09e" +PV = "0.7.1+git" +PR_append = ".gitr${SRCREV}" + +inherit gnome + +SRC_URI = "git://git.gnome.org/network-manager-applet;protocol=git;branch=NETWORKMANAGER_APPLET_0_7 \ +file://nm-applet.conf" + +S = "${WORKDIR}/git" + +# Hack around dbus a_console problems +do_install_append() { + install -m 0644 ${WORKDIR}/nm-applet.conf ${D}${sysconfdir}/dbus-1/system.d/ +} + +FILES_${PN} += "${datadir}/nm-applet/ \ + ${datadir}/gnome-vpn-properties/ \ + ${datadir}/gnome/autostart/ \ + " diff --git a/recipes/networkmanager/networkmanager-0.7.1/NetworkManager b/recipes/networkmanager/networkmanager/NetworkManager index 4cde8cc003..4cde8cc003 100755 --- a/recipes/networkmanager/networkmanager-0.7.1/NetworkManager +++ b/recipes/networkmanager/networkmanager/NetworkManager diff --git a/recipes/networkmanager/networkmanager-0.7.1/cx3110_bring_up.patch b/recipes/networkmanager/networkmanager/cx3110_bring_up.patch index db420ce2ba..db420ce2ba 100644 --- a/recipes/networkmanager/networkmanager-0.7.1/cx3110_bring_up.patch +++ b/recipes/networkmanager/networkmanager/cx3110_bring_up.patch diff --git a/recipes/networkmanager/networkmanager-0.7.1/disable_wireless_by_default.patch b/recipes/networkmanager/networkmanager/disable_wireless_by_default.patch index d194d96ea5..d194d96ea5 100644 --- a/recipes/networkmanager/networkmanager-0.7.1/disable_wireless_by_default.patch +++ b/recipes/networkmanager/networkmanager/disable_wireless_by_default.patch diff --git a/recipes/networkmanager/networkmanager-0.7.1/nm-system-settings.conf b/recipes/networkmanager/networkmanager/nm-system-settings.conf index fb9ef1ff97..fb9ef1ff97 100644 --- a/recipes/networkmanager/networkmanager-0.7.1/nm-system-settings.conf +++ b/recipes/networkmanager/networkmanager/nm-system-settings.conf diff --git a/recipes/networkmanager/networkmanager_git.bb b/recipes/networkmanager/networkmanager_git.bb new file mode 100644 index 0000000000..a492470c94 --- /dev/null +++ b/recipes/networkmanager/networkmanager_git.bb @@ -0,0 +1,33 @@ +require networkmanager-0.7.inc + +DEFAULT_PREFERENCE = "-1" + +SRCREV = "b9c125fa0a2a9878d9ac0f6140f14f436ddb1723" +PV = "0.7.1+git" +PR_append = ".gitr${SRCREV}" + +inherit gnome + +SRC_URI = "git://anongit.freedesktop.org/NetworkManager/NetworkManager;protocol=git;branch=NETWORKMANAGER_0_7 \ + file://remove-gtk-doc-make.patch;patch=1 \ + file://nm-system-settings.conf \ + file://NetworkManager \ + file://gtk-doc.make \ +" + + +do_configure_prepend() { + cp ${WORKDIR}/gtk-doc.make ${S}/ + echo "EXTRA_DIST = version.xml" > gnome-doc-utils.make + sed -i -e 's:man \\:man:' -e s:docs::g ${S}/Makefile.am + sed -i -e /^docs/d ${S}/configure.ac +} + +S = "${WORKDIR}/git" + +do_install_append () { + install -d ${D}/etc/NetworkManager/ + install -m 0644 ${WORKDIR}/nm-system-settings.conf ${D}/etc/NetworkManager/ + install -m 0755 ${WORKDIR}/NetworkManager ${D}/etc/init.d +} + |