]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
meta: cleanup PACKAGECONFIG ??= "" rbt/clean
authorRobert Yang <liezhi.yang@windriver.com>
Thu, 21 Jan 2016 08:51:22 +0000 (00:51 -0800)
committerRobert Yang <liezhi.yang@windriver.com>
Fri, 22 Jan 2016 01:58:33 +0000 (17:58 -0800)
The base.bbclass can handle PACKAGECONFIG well when it is not set, so
PACKAGECONFIG ??= "" isn't useful here, but there are a lot of them,
which may mislead the newbie that it is a must.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
36 files changed:
meta/recipes-bsp/grub/grub2.inc
meta/recipes-core/dbus/dbus-glib.inc
meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb
meta/recipes-devtools/gdb/gdb_7.10.1.bb
meta/recipes-devtools/mtools/mtools_3.9.9.bb
meta/recipes-devtools/mtools/mtools_4.0.18.bb
meta/recipes-devtools/opkg/opkg_0.3.1.bb
meta/recipes-devtools/python/python-imaging_1.1.7.bb
meta/recipes-devtools/ruby/ruby_2.2.2.bb
meta/recipes-extended/mc/mc_4.8.15.bb
meta/recipes-extended/minicom/minicom_2.7.bb
meta/recipes-extended/screen/screen_4.3.1.bb
meta/recipes-extended/sudo/sudo.inc
meta/recipes-extended/tar/tar_1.28.bb
meta/recipes-extended/wget/wget.inc
meta/recipes-gnome/gnome/gconf_3.2.6.bb
meta/recipes-graphics/directfb/directfb.inc
meta/recipes-graphics/piglit/piglit_git.bb
meta/recipes-graphics/wayland/libinput_1.1.4.bb
meta/recipes-graphics/xorg-lib/libice_1.0.9.bb
meta/recipes-graphics/xorg-lib/libx11-diet_1.6.3.bb
meta/recipes-graphics/xorg-lib/libxdmcp_1.1.2.bb
meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
meta/recipes-graphics/xorg-proto/xorg-proto-common.inc
meta/recipes-kernel/systemtap/systemtap_git.bb
meta/recipes-multimedia/webp/libwebp_0.5.0.bb
meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
meta/recipes-support/aspell/aspell_0.60.6.1.bb
meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
meta/recipes-support/boost/boost.inc
meta/recipes-support/gmp/gmp.inc
meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb
meta/recipes-support/gnupg/gnupg_1.4.7.bb
meta/recipes-support/gnupg/gnupg_2.1.10.bb
meta/recipes-support/libevent/libevent_2.0.22.bb
meta/recipes-support/libunwind/libunwind.inc

index a8c41f8e288713925ea40e4147918264be515b92..f8848dc4aaf7b88e3da34e7dd0b529ad4abef3b2 100644 (file)
@@ -39,7 +39,6 @@ COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)'
 
 inherit autotools gettext texinfo
 
-PACKAGECONFIG ??= ""
 PACKAGECONFIG[grub-mount] = "--enable-grub-mount,--disable-grub-mount,fuse"
 PACKAGECONFIG[device-mapper] = "--enable-device-mapper,--disable-device-mapper,lvm2"
 
index f8c0ebe804d930b5c69f86846d362476fd575cac..12d7bebc993d61e4d944c57b4084c2f7d09001ea 100644 (file)
@@ -19,7 +19,6 @@ inherit autotools pkgconfig gettext
 
 #default disable regression tests, some unit test code in non testing code
 #PACKAGECONFIG_pn-${PN} = "tests" enable regression tests local.conf
-PACKAGECONFIG ??= ""
 PACKAGECONFIG[tests] = "--enable-tests,,,"
 
 EXTRA_OECONF = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml \
index c82e99a5d146f75349d23b5407e241f89efe6a5b..d283b63eb703b9a46cddd75b9c3786393b810dc1 100644 (file)
@@ -18,7 +18,6 @@ EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \
 
 EXTRA_OECONF_darwin = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs"
 
-PACKAGECONFIG ??= ""
 PACKAGECONFIG[fuse] = '--enable-fuse2fs,--disable-fuse2fs,fuse'
 
 do_configure_prepend () {
index cd52e27d5698d5fc5d9dbb3115399fc34fbabd88..23171dc4004ba3fe645862762e97634ca5d69884 100644 (file)
@@ -3,7 +3,6 @@ require gdb-${PV}.inc
 
 inherit python-dir
 
-PACKAGECONFIG ??= ""
 PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,python,python python-codecs"
 PACKAGECONFIG[babeltrace] = "--with-babeltrace,--without-babeltrace,babeltrace"
 
index c284a71b4e89648dab4e81e47112f3f44a1380d0..d27f1b9ab2f086581edead6160f012568bf29441 100644 (file)
@@ -46,7 +46,6 @@ EXTRA_OECONF = "--without-x"
 
 BBCLASSEXTEND = "native nativesdk"
 
-PACKAGECONFIG ??= ""
 PACKAGECONFIG[libbsd] = "ac_cv_lib_bsd_main=yes,ac_cv_lib_bsd_main=no,libbsd"
 
 do_install_prepend () {
index bc9b79c13e2adea6976b2891285fddc5b8a9cb38..b4668919501c88b44580ba21093fc586e8ce3bbc 100644 (file)
@@ -37,7 +37,6 @@ EXTRA_OECONF = "--without-x"
 
 BBCLASSEXTEND = "native nativesdk"
 
-PACKAGECONFIG ??= ""
 PACKAGECONFIG[libbsd] = "ac_cv_lib_bsd_main=yes,ac_cv_lib_bsd_main=no,libbsd"
 
 do_install_prepend () {
index 577f495344c6d6271384a70fae5da694d95f3d01..67a88d3baa79209162bc01ce5691817ebaa6644d 100644 (file)
@@ -29,8 +29,6 @@ SYSTEMD_SERVICE_${PN} = "opkg-configure.service"
 target_localstatedir := "${localstatedir}"
 OPKGLIBDIR = "${target_localstatedir}/lib"
 
-PACKAGECONFIG ??= ""
-
 PACKAGECONFIG[gpg] = "--enable-gpg,--disable-gpg,gpgme libgpg-error,gnupg"
 PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl"
 PACKAGECONFIG[ssl-curl] = "--enable-ssl-curl,--disable-ssl-curl,curl openssl"
index a678328275f6a8e1dbafc3a1e7d8e6e8fc0a1a15..f26f56b3bb3238141928e9f91b196057c2bfc033 100644 (file)
@@ -17,7 +17,6 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 # There isn't enable/disable option, and lcms is in meta-oe, at least make it explicit when enabled
 # setup.py already has FIXME: add mechanism to explicitly *disable* the use of a library
-PACKAGECONFIG ??= ""
 PACKAGECONFIG[lcms] = ",,lcms"
 
 inherit distutils
index 9b807a7cd96ae0dbb99621c6723547d2ac782af5..0c3b99262502973324cf1b5767519aaca9bb599f 100644 (file)
@@ -8,7 +8,6 @@ SRC_URI[sha256sum] = "5ffc0f317e429e6b29d4a98ac521c3ce65481bfd22a8cf845fa02a7b11
 # 0001-socket-extconf-hardcode-wide-getaddr-info-test-outco.patch
 UNKNOWN_CONFIGURE_WHITELIST += "--enable-wide-getaddrinfo"
 
-PACKAGECONFIG ??= ""
 PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}"
 
 PACKAGECONFIG[valgrind] = "--with-valgrind=yes, --with-valgrind=no, valgrind"
index 6c3a16aabbed1821cc674cff13e28b852f8d356e..11cf95a54000a4ff3b49c6350e93b0c373475d41 100644 (file)
@@ -16,7 +16,6 @@ inherit autotools gettext pkgconfig
 #
 # Both Samba (smb) and sftp require package delivered from meta-openembedded
 #
-PACKAGECONFIG ??= ""
 PACKAGECONFIG[smb] = "--enable-vfs-smb,--disable-vfs-smb,samba,"
 PACKAGECONFIG[sftp] = "--enable-vfs-sftp,--disable-vfs-sftp,libssh2,"
 
index 3118686e19deeba92bc728c9fa057fd967581415..8c95bc5e62c8babeec34010812dcb24f28cd627f 100644 (file)
@@ -17,7 +17,6 @@ SRC_URI[sha256sum] = "9ac3a663b82f4f5df64114b4792b9926b536c85f59de0f2d2b321c7626
 
 UPSTREAM_CHECK_URI = "https://alioth.debian.org/frs/?group_id=30018"
 
-PACKAGECONFIG ??= ""
 PACKAGECONFIG[lockdev] = "--enable-lockdev,--disable-lockdev,lockdev"
 
 inherit autotools gettext pkgconfig
index 00d878b2c176e2cc31823a446afb334a7c449ad7..657e98c0a113c117a8ede7001adfb324ebf192dc 100644 (file)
@@ -32,7 +32,6 @@ SRC_URI[sha256sum] = "fa4049f8aee283de62e283d427f2cfd35d6c369b40f7f45f947dbfd915
 
 inherit autotools texinfo
 
-PACKAGECONFIG ??= ""
 PACKAGECONFIG[utempter] = "ac_cv_header_utempter_h=yes,ac_cv_header_utempter_h=no,libutempter,"
 
 EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5 \
index a25876b7fc52b6eb4040cc36603133d3a08936a5..0f271a5d1add225d0bc83ec82bc2b189601380b3 100644 (file)
@@ -16,7 +16,6 @@ LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=c16e542408abda013d672be8eb88d174 \
 
 inherit autotools
 
-PACKAGECONFIG ??= ""
 PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib"
 
 CONFFILES_${PN} = "${sysconfdir}/sudoers"
index 8816000399a269738121d0e4a203be31c66ecfc1..d08abf4567357155f893f892992168162e44379e 100644 (file)
@@ -1,6 +1,5 @@
 require tar.inc
 
-PACKAGECONFIG ??= ""
 PACKAGECONFIG[acl] = "--with-posix-acls, --without-posix-acls, acl,"
 
 LICENSE = "GPLv3"
index 049b898d39559237fd7422c4fc3a7bfa54951ae3..662925b7d5433ac4a3bd492111cc1fa2cc761c6f 100644 (file)
@@ -20,5 +20,4 @@ RRECOMMENDS_${PN} += "ca-certificates"
 
 BBCLASSEXTEND += "nativesdk"
 
-PACKAGECONFIG ??= ""
 PACKAGECONFIG[libuuid] = "--with-libuuid, --without-libuuid,util-linux"
index cd1df1ae5f06bd8ac2f10cfac3264a9948a9c9cf..5bf733bf0fbef6e2e513975eafe31d156915a358 100644 (file)
@@ -23,7 +23,6 @@ EXTRA_OECONF = "--enable-shared --disable-static --enable-debug=yes \
                 --disable-introspection --disable-orbit --with-openldap=no --disable-gtk"
 
 # Disable PolicyKit by default
-PACKAGECONFIG ??= ""
 # We really don't want PolicyKit for native or uclibc
 PACKAGECONFIG_class-native = ""
 PACKAGECONFIG_libc-uclibc = ""
index 603aba3f6e1a36690cdc68125bb196b7a8622273..725deb2c24eee79f842474d62990b1a6446f1f33 100644 (file)
@@ -29,7 +29,6 @@ BINCONFIG = "${bindir}/directfb-config"
 
 inherit autotools binconfig-disabled pkgconfig
 
-PACKAGECONFIG ??= ""
 PACKAGECONFIG[jpeg2000] = "--enable-jpeg2000,--disable-jpeg2000,jasper"
 PACKAGECONFIG[drmkms] = "--enable-drmkms,--disable-drmkms,libdrm"
 PACKAGECONFIG[tiff] = "--enable-tiff,--disable-tiff,tiff"
index e0bd1fe4331aa817a6dd7112d7fdf0e46bb2bdd5..d04bb2806741c1b65d957f01779be12f6e71a40d 100644 (file)
@@ -18,7 +18,6 @@ inherit cmake pythonnative distro_features_check
 # depends on virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
 
-PACKAGECONFIG ??= ""
 PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut,"
 
 do_configure_prepend() {
index 4167679c2cc42e86d94bd30b9ed4a05444f73558..8ceea7f910dd5e1c8e07f6ce7b0a084acd19cbbf 100644 (file)
@@ -15,7 +15,6 @@ SRC_URI[sha256sum] = "302cb76209b9c57a5a318e178f9bc446eede8ea79386103b5291cbfaa5
 
 inherit autotools pkgconfig
 
-PACKAGECONFIG ??= ""
 PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind"
 PACKAGECONFIG[gui] = "--enable-event-gui,--disable-event-gui,cairo gtk+3"
 
index 5049b7ee025abdaa6c246ffcca54332088392701..f7d9bf71fb1b553a7cadadc203b684b9ad847ac0 100644 (file)
@@ -23,5 +23,4 @@ BBCLASSEXTEND = "native"
 SRC_URI[md5sum] = "addfb1e897ca8079531669c7c7711726"
 SRC_URI[sha256sum] = "8f7032f2c1c64352b5423f6b48a8ebdc339cc63064af34d66a6c9aa79759e202"
 
-PACKAGECONFIG ??= ""
 PACKAGECONFIG[arc4] = "ac_cv_lib_bsd_arc4random_buf=yes,ac_cv_lib_bsd_arc4random_buf=no,libbsd"
index c0d014825848fd148c46184396e5d054556cda80..d397bd02de0b51eedd87e90a509245222d6be474 100644 (file)
@@ -16,4 +16,3 @@ SRC_URI[sha256sum] = "cf31a7c39f2f52e8ebd0db95640384e63451f9b014eed2bb7f5de03e8a
 
 EXTRA_OECONF += "--disable-xlocale"
 
-PACKAGECONFIG ??= ""
index f4e30d93d48e766dcf5993d73e13705c5dead480..92a01b90c71bcc0f38a74dc1ac7ee32e37a0d3a0 100644 (file)
@@ -25,5 +25,4 @@ BBCLASSEXTEND = "native nativesdk"
 SRC_URI[md5sum] = "18aa5c1279b01f9d18e3299969665b2e"
 SRC_URI[sha256sum] = "81fe09867918fff258296e1e1e159f0dc639cb30d201c53519f25ab73af4e4e2"
 
-PACKAGECONFIG ??= ""
 PACKAGECONFIG[arc4] = "ac_cv_lib_bsd_arc4random_buf=yes,ac_cv_lib_bsd_arc4random_buf=no,libbsd"
index 6f4e44454f23285110f6a1844e22d5ebc640f0f8..2a10be103682bf1406f9c2fc1fb19173920c882d 100644 (file)
@@ -15,7 +15,6 @@ inherit autotools distro_features_check pkgconfig
 
 EXTRA_OECONF = "--disable-specs --without-groff --without-ps2pdf --without-fop"
 
-PACKAGECONFIG ??= ""
 PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
 
 UNKNOWN_CONFIGURE_WHITELIST += "--enable-malloc0returnsnull --disable-malloc0returnsnull \
index 7a417c97425bf4b55728d76b415fe057c2e662b8..ec5c4b692002bf309d1cb3c1e30b7bc1b057fc58 100644 (file)
@@ -18,7 +18,6 @@ EXTRA_OECONF = "--without-fop"
 
 UNKNOWN_CONFIGURE_WHITELIST += "--without-fop --without-xmlto --with-xmlto"
 
-PACKAGECONFIG ??= ""
 PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
 
 # ${PN} is empty so we need to tweak -dev and -dbg package dependencies
index 97064b83857190ea73a4132c5716232a58bc42d2..b6af243e0cc3dde09a6c481b891fa664cf663497 100644 (file)
@@ -20,7 +20,6 @@ STAP_DOCS ?= "--disable-docs --disable-publican --disable-refdocs"
 
 EXTRA_OECONF += "${STAP_DOCS} "
 
-PACKAGECONFIG ??= ""
 PACKAGECONFIG[libvirt] = "--enable-libvirt,--disable-libvirt,libvirt"
 
 inherit autotools gettext pkgconfig
index c89adac5dff76ac9a504eed4042f05d08076076f..ce64c99a4140f8f209002d970ac82414206ec396 100644 (file)
@@ -29,7 +29,6 @@ EXTRA_OECONF = " \
 
 inherit autotools lib_package
 
-PACKAGECONFIG ??= ""
 
 # libwebpdecoder is a subset of libwebp, don't build it unless requested
 PACKAGECONFIG[decoder] = "--enable-libwebpdecoder,--disable-libwebpdecoder"
index 04a43c079e219b18d4ad7e521bc6017ad65f99fe..42a8f7502770064a25740277e4216290b5033209 100644 (file)
@@ -30,7 +30,6 @@ EXTRA_OECONF = "--enable-xim \
                --enable-combining --disable-perl \
                --with-x=${STAGING_DIR_HOST}${prefix}"
 
-PACKAGECONFIG ??= ""
 PACKAGECONFIG[startup] = "--enable-startup-notification,--disable-startup-notification,startup-notification,"
 
 do_configure_prepend () {
index 5a23754b74b3b5e4942321b31777795e52fed32c..69c9d434b617630f42cf7773e86b23aa54d0beda 100644 (file)
@@ -10,7 +10,6 @@ SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz"
 SRC_URI[md5sum] = "e66a9c9af6a60dc46134fdacf6ce97d7"
 SRC_URI[sha256sum] = "f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df6e1"
 
-PACKAGECONFIG ??= ""
 PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses"
 
 PACKAGES += "libaspell libpspell aspell-utils"
index 1e626f154c2bb6d665a9f1ca0a8fab361afdf870..b8b91b7ab1c7a44547411cdda60c7a4204eab06f 100644 (file)
@@ -33,7 +33,6 @@ do_install_append() {
 
 EXTRA_OECONF = "--without-python --enable-shared --enable-static --disable-openmp --with-java=no"
 
-PACKAGECONFIG ??= ""
 PACKAGECONFIG[cplusplus] = "--with-cplusplus,--without-cplusplus,icu"
 
 FILES_${PN} = "${sysconfdir} ${libdir}/*.so.* ${libdir}/${BPN}/*.so.*"
index 981e6eecb83d7126388fe25560eec0e87a43d063..8734c864cb9423cd45d4718d1b63dbc8b488894d 100644 (file)
@@ -24,7 +24,6 @@ BOOST_LIBS = "\
        "
 
 # optional boost-python library
-PACKAGECONFIG ??= ""
 PACKAGECONFIG[python] = ",,python python3"
 BOOST_LIBS += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python python3', '', d)}"
 inherit python-dir
index 6752a39d13422bdd19d24c286ad522f840b7d19e..3d25c1014e19dd842c5ed2ff26b0bb44b9fd937d 100644 (file)
@@ -12,5 +12,4 @@ ARM_INSTRUCTION_SET = "arm"
 
 BBCLASSEXTEND = "native nativesdk"
 
-PACKAGECONFIG ??= ""
 PACKAGECONFIG[readline] = "--with-readline=yes,--with-readline=no,readline"
index ccb3d3b7dc391ab354fa44aecd4cfbf65a7d5cf4..0f3250a8aa51f4cb737f0885c4afa0d599a80dd6 100644 (file)
@@ -18,5 +18,4 @@ inherit autotools pkgconfig
 
 PR = "r1"
 
-PACKAGECONFIG ??= ""
 PACKAGECONFIG[journald] = "--with-systemd-journal,--without-systemd-journal,systemd,systemd"
index b4ccbfed6965fbe8bc57b63ad89a85e81b5ce345..74a59164b342fe468b7285d975cd33c1ec2bbec8 100644 (file)
@@ -99,6 +99,5 @@ FILES_gpgv = "${bindir}/gpgv"
 # Exclude debug files from the main packages
 FILES_${PN} = "${bindir}/* ${datadir}/${BPN} ${libexecdir}/${BPN}/*"
 
-PACKAGECONFIG ??= ""
 PACKAGECONFIG[curl] = "--with-libcurl=${STAGING_LIBDIR},--without-libcurl,curl"
 PACKAGECONFIG[libusb] = "--with-libusb=${STAGING_LIBDIR},--without-libusb,libusb-compat"
index 5a4f2e8fb5cd0ac65cc0b1ef8df98b894d6a6631..a6c8bda057e9d76e3411e0871e62716ac88a05bb 100644 (file)
@@ -41,5 +41,4 @@ do_install_append() {
 
 RDEPENDS_${PN} = "gnutls"
 
-PACKAGECONFIG ??= ""
 PACKAGECONFIG[sqlite3] = "--enable-sqlite, --disable-sqlite, sqlite3"
index df8a31c58db8b030f8c990e17be5d2244c98df37..5df2acdcc4931879e84b0e51baeca042c57d9c97 100644 (file)
@@ -18,7 +18,6 @@ UPSTREAM_CHECK_URI = "http://libevent.org/"
 
 S = "${WORKDIR}/${BPN}-${PV}-stable"
 
-PACKAGECONFIG ??= ""
 PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl"
 
 inherit autotools
index 068858b2d89c4475434835c236ea19fa7b3b04ff..fad95c1921fe846eeb636d6a9cfe378b73343b3e 100644 (file)
@@ -9,7 +9,6 @@ SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
 
 inherit autotools
 
-PACKAGECONFIG ??= ""
 PACKAGECONFIG[lzma] = "--enable-minidebuginfo,--disable-minidebuginfo,xz"
 
 EXTRA_OECONF_arm = "--enable-debug-frame"