summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@embeddedalley.com>2008-11-26 14:12:27 -0500
committerTom Rini <trini@embeddedalley.com>2008-11-26 14:12:27 -0500
commitbb12cd9c0a757e6ef696d57923821829f00ace79 (patch)
tree9d64dd072fd5467a7839c10fa58bf72871b201c4
parente2da0ee76bdb189129db65a0ab7e10b0a9847351 (diff)
samba, samba-essential: Move IFACE related autoconf variables to common-linux site file.
As reported by me in bug 4854, the IFACE autoconf variables are found in some, bug not all arch site files, but these are really common linux variables and as such, should be in common-linux. Bump PR as there is a change here in some arches.
-rw-r--r--packages/samba/samba-essential_3.0.20.bb2
-rw-r--r--packages/samba/samba_3.0.23c.bb2
-rw-r--r--site/arm-linux3
-rw-r--r--site/arm-linux-uclibc3
-rw-r--r--site/armeb-linux2
-rw-r--r--site/armeb-linux-uclibc2
-rw-r--r--site/common-linux6
-rw-r--r--site/mipsel-linux-uclibc3
-rw-r--r--site/powerpc-common3
-rw-r--r--site/sh-common2
10 files changed, 8 insertions, 20 deletions
diff --git a/packages/samba/samba-essential_3.0.20.bb b/packages/samba/samba-essential_3.0.20.bb
index ecf591dbb5..5486e0ff88 100644
--- a/packages/samba/samba-essential_3.0.20.bb
+++ b/packages/samba/samba-essential_3.0.20.bb
@@ -1,7 +1,7 @@
require samba-essential.inc
inherit update-rc.d
-PR = "r6"
+PR = "r7"
SRC_URI = "file://config-lfs.patch;patch=1 \
file://init-essential \
diff --git a/packages/samba/samba_3.0.23c.bb b/packages/samba/samba_3.0.23c.bb
index fdbc67d1bc..f477001970 100644
--- a/packages/samba/samba_3.0.23c.bb
+++ b/packages/samba/samba_3.0.23c.bb
@@ -1,7 +1,7 @@
require samba.inc
inherit update-rc.d
-PR = "r2"
+PR = "r3"
SRC_URI += "file://config-lfs.patch;patch=1 \
file://init \
diff --git a/site/arm-linux b/site/arm-linux
index af008c5351..fa4ebc8bdb 100644
--- a/site/arm-linux
+++ b/site/arm-linux
@@ -60,8 +60,6 @@ samba_cv_HAVE_FCNTL_LOCK=${samba_cv_HAVE_FCNTL_LOCK=yes}
samba_cv_HAVE_FTRUNCATE_EXTEND=${samba_cv_HAVE_FTRUNCATE_EXTEND=yes}
samba_cv_HAVE_FUNCTION_MACRO=${samba_cv_HAVE_FUNCTION_MACRO=yes}
samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes}
-samba_cv_HAVE_IFACE_AIX=${samba_cv_HAVE_IFACE_AIX=no}
-samba_cv_HAVE_IFACE_IFCONF=${samba_cv_HAVE_IFACE_IFCONF=yes}
samba_cv_HAVE_INO64_T=${samba_cv_HAVE_INO64_T=no}
samba_cv_HAVE_INT16_FROM_RPC_RPC_H=${samba_cv_HAVE_INT16_FROM_RPC_RPC_H=no}
samba_cv_HAVE_INT32_FROM_RPC_RPC_H=${samba_cv_HAVE_INT32_FROM_RPC_RPC_H=no}
@@ -145,7 +143,6 @@ samba_cv_unixsocket=${samba_cv_unixsocket=yes}
samba_cv_volatile=${samba_cv_volatile=yes}
#older sambe defines
-samba_cv_HAVE_IFACE_IFREQ=${samba_cv_HAVE_IFACE_IFREQ=yes}
samba_cv_USE_SETEUID=${samba_cv_USE_SETEUID=yes}
samba_cv_USE_SETREUID=${samba_cv_USE_SETREUID=yes}
samba_cv_USE_SETUIDX=${samba_cv_USE_SETUIDX=yes}
diff --git a/site/arm-linux-uclibc b/site/arm-linux-uclibc
index 2933c3f3be..5f8ba34391 100644
--- a/site/arm-linux-uclibc
+++ b/site/arm-linux-uclibc
@@ -44,12 +44,9 @@ samba_cv_HAVE_FCNTL_LOCK=${samba_cv_HAVE_FCNTL_LOCK=yes}
samba_cv_HAVE_FTRUNCATE_EXTEND=${samba_cv_HAVE_FTRUNCATE_EXTEND=yes}
samba_cv_HAVE_FUNCTION_MACRO=${samba_cv_HAVE_FUNCTION_MACRO=yes}
samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes}
-samba_cv_HAVE_IFACE_AIX=${samba_cv_HAVE_IFACE_AIX=no}
-samba_cv_HAVE_IFACE_IFCONF=${samba_cv_HAVE_IFACE_IFCONF=yes}
samba_cv_HAVE_INO64_T=${samba_cv_HAVE_INO64_T=no}
samba_cv_HAVE_INT16_FROM_RPC_RPC_H=${samba_cv_HAVE_INT16_FROM_RPC_RPC_H=no}
samba_cv_HAVE_INT32_FROM_RPC_RPC_H=${samba_cv_HAVE_INT32_FROM_RPC_RPC_H=no}
-samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=${samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=no}
samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=${samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=yes}
samba_cv_HAVE_KERNEL_OPLOCKS_IRIX=${samba_cv_HAVE_KERNEL_OPLOCKS_IRIX=no}
samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=${samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes}
diff --git a/site/armeb-linux b/site/armeb-linux
index c852f00fee..d8da123230 100644
--- a/site/armeb-linux
+++ b/site/armeb-linux
@@ -31,8 +31,6 @@ ac_cv_time_r_type=${ac_cv_time_r_type=POSIX}
# samba
samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes}
-samba_cv_HAVE_IFACE_IFCONF=${samba_cv_HAVE_IFACE_IFCONF=yes}
-samba_cv_HAVE_IFACE_IFREQ=${samba_cv_HAVE_IFACE_IFREQ=yes}
samba_cv_USE_SETEUID=${samba_cv_USE_SETEUID=yes}
samba_cv_USE_SETRESUID=${samba_cv_USE_SETRESUID=yes}
samba_cv_USE_SETREUID=${samba_cv_USE_SETREUID=yes}
diff --git a/site/armeb-linux-uclibc b/site/armeb-linux-uclibc
index 02c63e4258..5e8600936e 100644
--- a/site/armeb-linux-uclibc
+++ b/site/armeb-linux-uclibc
@@ -31,8 +31,6 @@ ac_cv_time_r_type=${ac_cv_time_r_type=POSIX}
# samba
samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes}
-samba_cv_HAVE_IFACE_IFCONF=${samba_cv_HAVE_IFACE_IFCONF=yes}
-samba_cv_HAVE_IFACE_IFREQ=${samba_cv_HAVE_IFACE_IFREQ=yes}
samba_cv_USE_SETEUID=${samba_cv_USE_SETEUID=yes}
samba_cv_USE_SETRESUID=${samba_cv_USE_SETRESUID=yes}
samba_cv_USE_SETREUID=${samba_cv_USE_SETREUID=yes}
diff --git a/site/common-linux b/site/common-linux
index aeb256b4a9..1465b5fbc8 100644
--- a/site/common-linux
+++ b/site/common-linux
@@ -1,2 +1,8 @@
# apr
ac_cv_file__dev_zero=${ac_cv_file__dev_zero=yes}
+
+# samba
+samba_cv_HAVE_IFACE_AIX=${samba_cv_HAVE_IFACE_AIX=no}
+samba_cv_HAVE_IFACE_IFCONF=${samba_cv_HAVE_IFACE_IFCONF=yes}
+samba_cv_HAVE_IFACE_IFREQ=${samba_cv_HAVE_IFACE_IFREQ=yes}
+samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=${samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=no}
diff --git a/site/mipsel-linux-uclibc b/site/mipsel-linux-uclibc
index f36a30aa64..9545feab4c 100644
--- a/site/mipsel-linux-uclibc
+++ b/site/mipsel-linux-uclibc
@@ -93,10 +93,7 @@ samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT=${samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPP
samba_cv_HAVE_FCNTL_LOCK=${samba_cv_HAVE_FCNTL_LOCK=yes}
samba_cv_HAVE_FTRUNCATE_EXTEND=${samba_cv_HAVE_FTRUNCATE_EXTEND=yes}
samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes}
-samba_cv_HAVE_IFACE_AIX=${samba_cv_HAVE_IFACE_AIX=no}
-samba_cv_HAVE_IFACE_IFCONF=${samba_cv_HAVE_IFACE_IFCONF=yes}
samba_cv_HAVE_INO64_T=${samba_cv_HAVE_INO64_T=no}
-samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=${samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=no}
samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=${samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=yes}
samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=${samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes}
samba_cv_HAVE_KERNEL_SHARE_MODES=${samba_cv_HAVE_KERNEL_SHARE_MODES=yes}
diff --git a/site/powerpc-common b/site/powerpc-common
index 278736e74a..7a988b16bd 100644
--- a/site/powerpc-common
+++ b/site/powerpc-common
@@ -278,9 +278,6 @@ samba_cv_HAVE_DEVICE_MINOR_FN=${samba_cv_HAVE_DEVICE_MINOR_FN=yes}
samba_cv_HAVE_FCNTL_LOCK=${samba_cv_HAVE_FCNTL_LOCK=yes}
samba_cv_HAVE_FTRUNCATE_EXTEND=${samba_cv_HAVE_FTRUNCATE_EXTEND=yes}
samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes}
-samba_cv_HAVE_IFACE_AIX=${samba_cv_HAVE_IFACE_AIX=no}
-samba_cv_HAVE_IFACE_IFCONF=${samba_cv_HAVE_IFACE_IFCONF=yes}
-samba_cv_HAVE_IFACE_IFREQ=${samba_cv_HAVE_IFACE_IFREQ=yes}
samba_cv_HAVE_INO64_T=${samba_cv_HAVE_INO64_T=no}
samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=${samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=yes}
samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=${samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes}
diff --git a/site/sh-common b/site/sh-common
index b5605507fd..a9ccf2ffb7 100644
--- a/site/sh-common
+++ b/site/sh-common
@@ -85,8 +85,6 @@ ac_cv_lib_png_png_create_info_struct=${ac_cv_lib_png_png_create_info_struct=yes}
# samba
samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes}
-samba_cv_HAVE_IFACE_IFCONF=${samba_cv_HAVE_IFACE_IFCONF=yes}
-samba_cv_HAVE_IFACE_IFREQ=${samba_cv_HAVE_IFACE_IFREQ=yes}
samba_cv_USE_SETEUID=${samba_cv_USE_SETEUID=yes}
samba_cv_USE_SETRESUID=${samba_cv_USE_SETRESUID=yes}
samba_cv_USE_SETREUID=${samba_cv_USE_SETREUID=yes}