Ticket #2682: NetworkManager-0.8.998-lfs-1.patch
File NetworkManager-0.8.998-lfs-1.patch, 11.8 KB (added by , 13 years ago) |
---|
-
config.h.in
diff -Naur b/config.h.in a/config.h.in
b a 165 165 /* Define if you have Gentoo */ 166 166 #undef TARGET_GENTOO 167 167 168 /* Define if you have LFS */ 169 #undef TARGET_LFS 170 168 171 /* Define if you have linexa */ 169 172 #undef TARGET_LINEXA 170 173 -
configure
diff -Naur b/configure a/configure
b a 697 697 PKG_CONFIG 698 698 LIBDL 699 699 LIBM 700 TARGET_LFS_FALSE 701 TARGET_LFS_TRUE 700 702 TARGET_EXHERBO_FALSE 701 703 TARGET_EXHERBO_TRUE 702 704 TARGET_LINEXA_FALSE … … 1624 1626 --with-docs Build NetworkManager documentation 1625 1627 --with-distro=DISTRO Specify the Linux distribution to target: One of 1626 1628 redhat, suse, gentoo, debian, arch, slackware, 1627 paldo, mandriva, pardus, linexa or exherbo1629 paldo, mandriva, pardus, linexa, exherbo or lfs 1628 1630 --with-dist-version=<NM-distribution-version> 1629 1631 Define the NM's distribution version string 1630 1632 --with-udev-dir=DIR where the udev base directory is … … 15794 15796 with_distro="exherbo" 15795 15797 fi 15796 15798 15799 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/lfs-release" >&5 15800 $as_echo_n "checking for /etc/lfs-release... " >&6; } 15801 if test "${ac_cv_file__etc_lfs_release+set}" = set; then : 15802 $as_echo_n "(cached) " >&6 15803 else 15804 test "$cross_compiling" = yes && 15805 as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 15806 if test -r "/etc/lfs-release"; then 15807 ac_cv_file__etc_lfs_release=yes 15808 else 15809 ac_cv_file__etc_lfs_release=no 15810 fi 15811 fi 15812 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_lfs_release" >&5 15813 $as_echo "$ac_cv_file__etc_lfs_release" >&6; } 15814 if test "x$ac_cv_file__etc_lfs_release" = x""yes; then : 15815 with_distro="lfs" 15816 fi 15817 15797 15818 if test "z$with_distro" = "z"; then 15798 15819 with_distro=`lsb_release -is` 15799 15820 fi … … 15805 15826 exit 1 15806 15827 else 15807 15828 case $with_distro in 15808 redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|exherbo ) ;;15829 redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|exherbo|lfs) ;; 15809 15830 *) 15810 15831 echo "Your distribution (${with_distro}) is not yet supported! (patches welcome)" 15811 15832 exit 1 … … 15981 16002 15982 16003 fi 15983 16004 16005 if test x"$with_distro" = xlfs; then 16006 TARGET_LFS_TRUE= 16007 TARGET_LFS_FALSE='#' 16008 else 16009 TARGET_LFS_TRUE='#' 16010 TARGET_LFS_FALSE= 16011 fi 16012 16013 if test x"$with_distro" = xlfs; then 16014 16015 $as_echo "#define TARGET_LFS 1" >>confdefs.h 16016 16017 fi 16018 15984 16019 15985 16020 # Check whether --with-dist-version was given. 15986 16021 if test "${with_dist_version+set}" = set; then : … … 18658 18693 as_fn_error $? "conditional \"TARGET_EXHERBO\" was never defined. 18659 18694 Usually this means the macro was only invoked conditionally." "$LINENO" 5 18660 18695 fi 18696 if test -z "${TARGET_LFS_TRUE}" && test -z "${TARGET_LFS_FALSE}"; then 18697 as_fn_error $? "conditional \"TARGET_LFS\" was never defined. 18698 Usually this means the macro was only invoked conditionally." "$LINENO" 5 18699 fi 18661 18700 if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then 18662 18701 as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined. 18663 18702 Usually this means the macro was only invoked conditionally." "$LINENO" 5 -
configure.ac
diff -Naur b/configure.ac a/configure.ac
b a 103 103 dnl 104 104 AC_C_BIGENDIAN 105 105 106 AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, arch, slackware, paldo, mandriva, pardus, linexa or exherbo]))106 AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, arch, slackware, paldo, mandriva, pardus, linexa, exherbo or lfs])) 107 107 if test "z$with_distro" = "z"; then 108 108 AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat") 109 109 AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse") … … 117 117 AC_CHECK_FILE(/etc/pardus-release,with_distro="pardus") 118 118 AC_CHECK_FILE(/etc/linexa-release,with_distro="linexa") 119 119 AC_CHECK_FILE(/etc/exherbo-release,with_distro="exherbo") 120 AC_CHECK_FILE(/etc/lfs-release,with_distro="lfs") 120 121 if test "z$with_distro" = "z"; then 121 122 with_distro=`lsb_release -is` 122 123 fi … … 128 129 exit 1 129 130 else 130 131 case $with_distro in 131 redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|exherbo ) ;;132 redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|exherbo|lfs) ;; 132 133 *) 133 134 echo "Your distribution (${with_distro}) is not yet supported! (patches welcome)" 134 135 exit 1 … … 196 197 AC_DEFINE(TARGET_EXHERBO, 1, [Define if you have Exherbo]) 197 198 fi 198 199 200 AM_CONDITIONAL(TARGET_LFS, test x"$with_distro" = xlfs) 201 if test x"$with_distro" = xlfs; then 202 AC_DEFINE(TARGET_LFS, 1, [Define if you have LFS]) 203 fi 204 199 205 dnl 200 206 dnl Distribution version string 201 207 dnl -
src/backends/Makefile.am
diff -Naur b/src/backends/Makefile.am a/src/backends/Makefile.am
b a 61 61 libnmbackend_la_SOURCES += NetworkManagerExherbo.c 62 62 endif 63 63 64 if TARGET_LFS 65 libnmbackend_la_SOURCES += NetworkManagerLFS.c 66 endif 67 64 68 libnmbackend_la_LIBADD += \ 65 69 $(top_builddir)/src/logging/libnm-logging.la \ 66 70 $(DBUS_LIBS) \ -
src/backends/Makefile.in
diff -Naur b/src/backends/Makefile.in a/src/backends/Makefile.in
b a 47 47 @TARGET_PARDUS_TRUE@am__append_11 = NetworkManagerPardus.c 48 48 @TARGET_LINEXA_TRUE@am__append_12 = NetworkManagerLinexa.c 49 49 @TARGET_EXHERBO_TRUE@am__append_13 = NetworkManagerExherbo.c 50 @TARGET_LFS_TRUE@am__append_14 = NetworkManagerLFS.c 50 51 subdir = src/backends 51 52 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in 52 53 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 … … 79 80 NetworkManagerArch.c NetworkManagerPaldo.c \ 80 81 NetworkManagerFrugalware.c NetworkManagerMandriva.c \ 81 82 NetworkManagerPardus.c NetworkManagerLinexa.c \ 82 NetworkManagerExherbo.c 83 NetworkManagerExherbo.c NetworkManagerLFS.c 83 84 @TARGET_REDHAT_TRUE@am__objects_1 = \ 84 85 @TARGET_REDHAT_TRUE@ libnmbackend_la-NetworkManagerRedHat.lo 85 86 @TARGET_SUSE_TRUE@am__objects_2 = \ … … 101 102 @TARGET_LINEXA_TRUE@ libnmbackend_la-NetworkManagerLinexa.lo 102 103 @TARGET_EXHERBO_TRUE@am__objects_12 = \ 103 104 @TARGET_EXHERBO_TRUE@ libnmbackend_la-NetworkManagerExherbo.lo 105 @TARGET_LFS_TRUE@am__objects_13 = \ 106 @TARGET_LFS_TRUE@ libnmbackend_la-NetworkManagerLFS.lo 104 107 am_libnmbackend_la_OBJECTS = libnmbackend_la-NetworkManagerGeneric.lo \ 105 108 $(am__objects_1) $(am__objects_2) $(am__objects_3) \ 106 109 $(am__objects_4) $(am__objects_5) $(am__objects_6) \ 107 110 $(am__objects_7) $(am__objects_8) $(am__objects_9) \ 108 $(am__objects_10) $(am__objects_11) $(am__objects_12) 111 $(am__objects_10) $(am__objects_11) $(am__objects_12) \ 112 $(am__objects_13) 109 113 libnmbackend_la_OBJECTS = $(am_libnmbackend_la_OBJECTS) 110 114 AM_V_lt = $(am__v_lt_$(V)) 111 115 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) … … 353 357 $(am__append_3) $(am__append_4) $(am__append_5) \ 354 358 $(am__append_6) $(am__append_7) $(am__append_8) \ 355 359 $(am__append_10) $(am__append_11) $(am__append_12) \ 356 $(am__append_13) 360 $(am__append_13) $(am__append_14) 357 361 libnmbackend_la_LIBADD = $(am__append_9) \ 358 362 $(top_builddir)/src/logging/libnm-logging.la $(DBUS_LIBS) \ 359 363 $(GLIB_LIBS) … … 423 427 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerFrugalware.Plo@am__quote@ 424 428 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerGeneric.Plo@am__quote@ 425 429 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerGentoo.Plo@am__quote@ 430 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerLFS.Plo@am__quote@ 426 431 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerLinexa.Plo@am__quote@ 427 432 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerMandriva.Plo@am__quote@ 428 433 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerPaldo.Plo@am__quote@ … … 562 567 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 563 568 @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnmbackend_la-NetworkManagerExherbo.lo `test -f 'NetworkManagerExherbo.c' || echo '$(srcdir)/'`NetworkManagerExherbo.c 564 569 570 libnmbackend_la-NetworkManagerLFS.lo: NetworkManagerLFS.c 571 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnmbackend_la-NetworkManagerLFS.lo -MD -MP -MF $(DEPDIR)/libnmbackend_la-NetworkManagerLFS.Tpo -c -o libnmbackend_la-NetworkManagerLFS.lo `test -f 'NetworkManagerLFS.c' || echo '$(srcdir)/'`NetworkManagerLFS.c 572 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libnmbackend_la-NetworkManagerLFS.Tpo $(DEPDIR)/libnmbackend_la-NetworkManagerLFS.Plo 573 @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ 574 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='NetworkManagerLFS.c' object='libnmbackend_la-NetworkManagerLFS.lo' libtool=yes @AMDEPBACKSLASH@ 575 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 576 @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnmbackend_la-NetworkManagerLFS.lo `test -f 'NetworkManagerLFS.c' || echo '$(srcdir)/'`NetworkManagerLFS.c 577 565 578 mostlyclean-libtool: 566 579 -rm -f *.lo 567 580 -
src/backends/NetworkManagerLFS.c
diff -Naur b/src/backends/NetworkManagerLFS.c a/src/backends/NetworkManagerLFS.c
b a 1 /* NetworkManager -- Network link manager 2 * 3 * Jürg Billeter <juerg@paldo.org> 4 * 5 * Heavily based on NetworkManagerRedhat.c by Dan Williams <dcbw@redhat.com> 6 * 7 * This program is free software; you can redistribute it and/or modify 8 * it under the terms of the GNU General Public License as published by 9 * the Free Software Foundation; either version 2 of the License, or 10 * (at your option) any later version. 11 * 12 * This program is distributed in the hope that it will be useful, 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * GNU General Public License for more details. 16 * 17 * You should have received a copy of the GNU General Public License along 18 * with this program; if not, write to the Free Software Foundation, Inc., 19 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 20 * 21 * (C) Copyright 2004 Red Hat, Inc. 22 * (C) Copyright 2006 Jürg Billeter 23 */ 24 25 #ifdef HAVE_CONFIG_H 26 #include <config.h> 27 #endif 28 29 #include <stdio.h> 30 #include <string.h> 31 #include <stdlib.h> 32 33 #include "NetworkManagerGeneric.h" 34 #include "nm-system.h" 35 #include "NetworkManagerUtils.h" 36 #include "nm-logging.h" 37 38 /* 39 * nm_system_enable_loopback 40 * 41 * Bring up the loopback interface 42 * 43 */ 44 void nm_system_enable_loopback (void) 45 { 46 nm_spawn_process ("/etc/rc.d/init.d/localnet restart"); 47 } 48 49 /* 50 * nm_system_update_dns 51 * 52 * Invalidate the nscd host cache, if it exists, since 53 * we changed resolv.conf. 54 * 55 */ 56 void nm_system_update_dns (void) 57 { 58 if (g_file_test("/var/run/nscd/nscd.pid", G_FILE_TEST_EXISTS)) 59 nm_log_info (LOGD_DNS, "Clearing nscd hosts cache."); 60 nm_spawn_process ("/usr/sbin/nscd -i hosts"); 61 } 62 63