summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2017-03-06 20:58:47 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-08 11:52:56 +0000
commit9f3246522ccb2138aed86f39d25f8a4f7a489559 (patch)
tree7f9c4f0f418a98797b95ca78f3d4eefb927eb71b
parentfc6c81da79897c95a9c81960a1dee49517f2562a (diff)
downloadpoky-9f3246522ccb2138aed86f39d25f8a4f7a489559.tar.gz
meta: start to ignore the largefile distro feature
The largefile distro feature has been enabled by default in oe-core for a long time and, more recently, also in poky-tiny. Building without the largefile distro feature receives little or no testing. Many packages now enable LFS without exposing a configure option, so there should be very little expectation that disabling the distro feature will result in a distro which globally disables LFS. Respecting the distro feature adds a maintenance over-head and may be the source of configurations oddities (e.g. dbus-native currently builds with LFS disabled for no clear reason - fixed by this commit). Ignore the largefile distro feature more widely, as a first step towards deprecating and eventually removing it. (From OE-Core rev: a75ccaea77c8aad8d46e87e8ed4af2e2e0ad5327) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-bsp/grub/grub-efi_2.00.bb6
-rw-r--r--meta/recipes-bsp/grub/grub_2.00.bb6
-rw-r--r--meta/recipes-bsp/grub/grub_git.bb6
-rw-r--r--meta/recipes-core/dbus/dbus_1.10.14.bb4
-rw-r--r--meta/recipes-devtools/cmake/cmake_3.7.2.bb2
-rw-r--r--meta/recipes-devtools/dosfstools/dosfstools_4.1.bb2
-rw-r--r--meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb7
-rw-r--r--meta/recipes-devtools/perl/perl_5.24.1.bb13
-rw-r--r--meta/recipes-extended/libarchive/libarchive_3.2.2.bb7
-rw-r--r--meta/recipes-extended/lighttpd/lighttpd_1.4.45.bb5
10 files changed, 23 insertions, 35 deletions
diff --git a/meta/recipes-bsp/grub/grub-efi_2.00.bb b/meta/recipes-bsp/grub/grub-efi_2.00.bb
index e0503013fd..e12f1d773f 100644
--- a/meta/recipes-bsp/grub/grub-efi_2.00.bb
+++ b/meta/recipes-bsp/grub/grub-efi_2.00.bb
@@ -31,9 +31,9 @@ inherit deploy
31CACHED_CONFIGUREVARS += "ac_cv_path_HELP2MAN=" 31CACHED_CONFIGUREVARS += "ac_cv_path_HELP2MAN="
32EXTRA_OECONF = "--with-platform=efi --disable-grub-mkfont \ 32EXTRA_OECONF = "--with-platform=efi --disable-grub-mkfont \
33 --enable-efiemu=no --program-prefix='' \ 33 --enable-efiemu=no --program-prefix='' \
34 --enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no" 34 --enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no \
35 35 --enable-largefile \
36EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '--enable-largefile', '--disable-largefile', d)}" 36"
37 37
38# ldm.c:114:7: error: trampoline generated for nested function 'hook' [-Werror=trampolines] 38# ldm.c:114:7: error: trampoline generated for nested function 'hook' [-Werror=trampolines]
39# and many other places in the grub code when compiled with some native gcc compilers (specifically, gentoo) 39# and many other places in the grub code when compiled with some native gcc compilers (specifically, gentoo)
diff --git a/meta/recipes-bsp/grub/grub_2.00.bb b/meta/recipes-bsp/grub/grub_2.00.bb
index 07e1d101b3..c3829381ae 100644
--- a/meta/recipes-bsp/grub/grub_2.00.bb
+++ b/meta/recipes-bsp/grub/grub_2.00.bb
@@ -4,9 +4,9 @@ RDEPENDS_${PN} = "diffutils freetype grub-editenv"
4PR = "r1" 4PR = "r1"
5 5
6EXTRA_OECONF = "--with-platform=pc --disable-grub-mkfont --program-prefix="" \ 6EXTRA_OECONF = "--with-platform=pc --disable-grub-mkfont --program-prefix="" \
7 --enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no" 7 --enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no \
8 8 --enable-largefile \
9EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '--enable-largefile', '--disable-largefile', d)}" 9"
10 10
11PACKAGES =+ "grub-editenv" 11PACKAGES =+ "grub-editenv"
12 12
diff --git a/meta/recipes-bsp/grub/grub_git.bb b/meta/recipes-bsp/grub/grub_git.bb
index 27a5d1f123..0a81e530f4 100644
--- a/meta/recipes-bsp/grub/grub_git.bb
+++ b/meta/recipes-bsp/grub/grub_git.bb
@@ -27,9 +27,9 @@ GRUBPLATFORM_aarch64 = "efi"
27GRUBPLATFORM ??= "pc" 27GRUBPLATFORM ??= "pc"
28 28
29EXTRA_OECONF = "--with-platform=${GRUBPLATFORM} --disable-grub-mkfont --program-prefix="" \ 29EXTRA_OECONF = "--with-platform=${GRUBPLATFORM} --disable-grub-mkfont --program-prefix="" \
30 --enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no" 30 --enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no \
31 31 --enable-largefile \
32EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '--enable-largefile', '--disable-largefile', d)}" 32"
33 33
34do_install_append () { 34do_install_append () {
35 install -d ${D}${sysconfdir}/grub.d 35 install -d ${D}${sysconfdir}/grub.d
diff --git a/meta/recipes-core/dbus/dbus_1.10.14.bb b/meta/recipes-core/dbus/dbus_1.10.14.bb
index 6354572b84..e1d7356309 100644
--- a/meta/recipes-core/dbus/dbus_1.10.14.bb
+++ b/meta/recipes-core/dbus/dbus_1.10.14.bb
@@ -95,18 +95,18 @@ EXTRA_OECONF = "--disable-tests \
95 --disable-xml-docs \ 95 --disable-xml-docs \
96 --disable-doxygen-docs \ 96 --disable-doxygen-docs \
97 --disable-libaudit \ 97 --disable-libaudit \
98 --enable-largefile \
98 " 99 "
99 100
100EXTRA_OECONF_append_class-target = " SYSTEMCTL=${base_bindir}/systemctl" 101EXTRA_OECONF_append_class-target = " SYSTEMCTL=${base_bindir}/systemctl"
101EXTRA_OECONF_append_class-native = " --disable-selinux" 102EXTRA_OECONF_append_class-native = " --disable-selinux"
102 103
103PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'largefile systemd x11', d)}" 104PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)}"
104PACKAGECONFIG_class-native = "" 105PACKAGECONFIG_class-native = ""
105PACKAGECONFIG_class-nativesdk = "" 106PACKAGECONFIG_class-nativesdk = ""
106 107
107PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_system_unitdir},--disable-systemd --without-systemdsystemunitdir,systemd" 108PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_system_unitdir},--disable-systemd --without-systemdsystemunitdir,systemd"
108PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm" 109PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm"
109PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,,"
110PACKAGECONFIG[user-session] = "--enable-user-session --with-systemduserunitdir=${systemd_user_unitdir},--disable-user-session" 110PACKAGECONFIG[user-session] = "--enable-user-session --with-systemduserunitdir=${systemd_user_unitdir},--disable-user-session"
111 111
112do_install() { 112do_install() {
diff --git a/meta/recipes-devtools/cmake/cmake_3.7.2.bb b/meta/recipes-devtools/cmake/cmake_3.7.2.bb
index 787f33c02b..f566a48cfb 100644
--- a/meta/recipes-devtools/cmake/cmake_3.7.2.bb
+++ b/meta/recipes-devtools/cmake/cmake_3.7.2.bb
@@ -30,7 +30,7 @@ EXTRA_OECMAKE=" \
30 -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \ 30 -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \
31 -DKWSYS_CHAR_IS_SIGNED=1 \ 31 -DKWSYS_CHAR_IS_SIGNED=1 \
32 -DBUILD_CursesDialog=0 \ 32 -DBUILD_CursesDialog=0 \
33 ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '-DKWSYS_LFS_WORKS=1', '-DKWSYS_LFS_DISABLE=1', d)} \ 33 -DKWSYS_LFS_WORKS=1 \
34" 34"
35 35
36do_install_append_class-nativesdk() { 36do_install_append_class-nativesdk() {
diff --git a/meta/recipes-devtools/dosfstools/dosfstools_4.1.bb b/meta/recipes-devtools/dosfstools/dosfstools_4.1.bb
index 458cf877da..69aa81af44 100644
--- a/meta/recipes-devtools/dosfstools/dosfstools_4.1.bb
+++ b/meta/recipes-devtools/dosfstools/dosfstools_4.1.bb
@@ -20,6 +20,6 @@ inherit autotools pkgconfig
20 20
21EXTRA_OECONF = "--without-udev --enable-compat-symlinks" 21EXTRA_OECONF = "--without-udev --enable-compat-symlinks"
22 22
23CFLAGS += "-D_GNU_SOURCE ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64', '', d)}" 23CFLAGS += "-D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
24 24
25BBCLASSEXTEND = "native" 25BBCLASSEXTEND = "native"
diff --git a/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb b/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb
index dabb4db382..476fa6f074 100644
--- a/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb
+++ b/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb
@@ -29,9 +29,10 @@ BBCLASSEXTEND = "native"
29 29
30inherit autotools pkgconfig 30inherit autotools pkgconfig
31 31
32PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'largefile', d)} \ 32PACKAGECONFIG ??= ""
33" 33
34PACKAGECONFIG[libcap] = "--with-caps, --without-caps, libcap" 34PACKAGECONFIG[libcap] = "--with-caps, --without-caps, libcap"
35PACKAGECONFIG[libseccomp] = "--with-seccomp, --without-seccomp, libseccomp" 35PACKAGECONFIG[libseccomp] = "--with-seccomp, --without-seccomp, libseccomp"
36PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,,"
37PACKAGECONFIG[pyelftools] = "--with-python, --without-python,, pyelftools" 36PACKAGECONFIG[pyelftools] = "--with-python, --without-python,, pyelftools"
37
38EXTRA_OECONF += "--enable-largefile"
diff --git a/meta/recipes-devtools/perl/perl_5.24.1.bb b/meta/recipes-devtools/perl/perl_5.24.1.bb
index 147e151d74..cf7a8e1218 100644
--- a/meta/recipes-devtools/perl/perl_5.24.1.bb
+++ b/meta/recipes-devtools/perl/perl_5.24.1.bb
@@ -99,17 +99,6 @@ LDFLAGS_append = " -fstack-protector"
99# We're almost Debian, aren't we? 99# We're almost Debian, aren't we?
100CFLAGS += "-DDEBIAN" 100CFLAGS += "-DDEBIAN"
101 101
102do_nolargefile() {
103 sed -i -e "s,\(uselargefiles=\)'define',\1'undef',g" \
104 -e "s,\(d_readdir64_r=\)'define',\1'undef',g" \
105 -e "s,\(readdir64_r_proto=\)'\w+',\1'0',g" \
106 -e "/ccflags_uselargefiles/d" \
107 -e "s/-Duselargefiles//" \
108 -e "s/-D_FILE_OFFSET_BITS=64//" \
109 -e "s/-D_LARGEFILE_SOURCE//" \
110 ${S}/Cross/config.sh-${TARGET_ARCH}-${TARGET_OS}
111}
112
113do_configure() { 102do_configure() {
114 # Make hostperl in build directory be the native perl 103 # Make hostperl in build directory be the native perl
115 ln -sf ${HOSTPERL} hostperl 104 ln -sf ${HOSTPERL} hostperl
@@ -182,8 +171,6 @@ do_configure() {
182 config.sh-${TARGET_ARCH}-${TARGET_OS} 171 config.sh-${TARGET_ARCH}-${TARGET_OS}
183 fi 172 fi
184 173
185 ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '', 'do_nolargefile', d)}
186
187 # Update some paths in the configuration 174 # Update some paths in the configuration
188 sed -i -e 's,@ARCH@-thread-multi,,g' \ 175 sed -i -e 's,@ARCH@-thread-multi,,g' \
189 -e 's,@ARCH@,${TARGET_ARCH}-${TARGET_OS},g' \ 176 -e 's,@ARCH@,${TARGET_ARCH}-${TARGET_OS},g' \
diff --git a/meta/recipes-extended/libarchive/libarchive_3.2.2.bb b/meta/recipes-extended/libarchive/libarchive_3.2.2.bb
index 5e9c1184b6..da959a2f55 100644
--- a/meta/recipes-extended/libarchive/libarchive_3.2.2.bb
+++ b/meta/recipes-extended/libarchive/libarchive_3.2.2.bb
@@ -11,17 +11,14 @@ PACKAGECONFIG ?= "zlib bz2"
11 11
12PACKAGECONFIG_append_class-target = "\ 12PACKAGECONFIG_append_class-target = "\
13 libxml2 \ 13 libxml2 \
14 ${@bb.utils.filter('DISTRO_FEATURES', 'acl largefile xattr', d)} \ 14 ${@bb.utils.filter('DISTRO_FEATURES', 'acl xattr', d)} \
15" 15"
16 16
17PACKAGECONFIG_append_class-nativesdk = " largefile"
18
19DEPENDS_BZIP2 = "bzip2-replacement-native" 17DEPENDS_BZIP2 = "bzip2-replacement-native"
20DEPENDS_BZIP2_class-target = "bzip2" 18DEPENDS_BZIP2_class-target = "bzip2"
21 19
22PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," 20PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl,"
23PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr," 21PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr,"
24PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,,"
25PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib," 22PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib,"
26PACKAGECONFIG[bz2] = "--with-bz2lib,--without-bz2lib,${DEPENDS_BZIP2}," 23PACKAGECONFIG[bz2] = "--with-bz2lib,--without-bz2lib,${DEPENDS_BZIP2},"
27PACKAGECONFIG[xz] = "--with-lzmadec --with-lzma,--without-lzmadec --without-lzma,xz," 24PACKAGECONFIG[xz] = "--with-lzmadec --with-lzma,--without-lzmadec --without-lzma,xz,"
@@ -32,6 +29,8 @@ PACKAGECONFIG[lzo] = "--with-lzo2,--without-lzo2,lzo,"
32PACKAGECONFIG[nettle] = "--with-nettle,--without-nettle,nettle," 29PACKAGECONFIG[nettle] = "--with-nettle,--without-nettle,nettle,"
33PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," 30PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4,"
34 31
32EXTRA_OECONF += "--enable-largefile"
33
35SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \ 34SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \
36 file://non-recursive-extract-and-list.patch \ 35 file://non-recursive-extract-and-list.patch \
37 file://0001-archive_write_disk_posix.c-make-_fsobj-functions-mor.patch \ 36 file://0001-archive_write_disk_posix.c-make-_fsobj-functions-mor.patch \
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.45.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.45.bb
index 55218518fa..08dda33606 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.45.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.45.bb
@@ -25,10 +25,9 @@ SRC_URI[sha256sum] = "1c97225deea33eefba6d4158c2cef27913d47553263516bbe9d2e2760f
25 25
26PACKAGECONFIG ??= "openssl pcre zlib \ 26PACKAGECONFIG ??= "openssl pcre zlib \
27 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ 27 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
28 ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'lfs', '', d)} \
29 ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ 28 ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \
30" 29"
31PACKAGECONFIG[lfs] = "--enable-lfs,--disable-lfs" 30
32PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6" 31PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6"
33PACKAGECONFIG[mmap] = "--enable-mmap,--disable-mmap" 32PACKAGECONFIG[mmap] = "--enable-mmap,--disable-mmap"
34PACKAGECONFIG[libev] = "--with-libev,--without-libev,libev" 33PACKAGECONFIG[libev] = "--with-libev,--without-libev,libev"
@@ -48,6 +47,8 @@ PACKAGECONFIG[gdbm] = "--with-gdbm,--without-gdbm,gdbm"
48PACKAGECONFIG[memcache] = "--with-memcached,--without-memcached,libmemcached" 47PACKAGECONFIG[memcache] = "--with-memcached,--without-memcached,libmemcached"
49PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua5.1" 48PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua5.1"
50 49
50EXTRA_OECONF += "--enable-lfs"
51
51inherit autotools pkgconfig update-rc.d gettext systemd 52inherit autotools pkgconfig update-rc.d gettext systemd
52 53
53INITSCRIPT_NAME = "lighttpd" 54INITSCRIPT_NAME = "lighttpd"