Merge remote-tracking branch 'oe21/master' into vuplus-3.0
authorhschang <chang@dev3>
Thu, 22 Jan 2015 07:19:04 +0000 (16:19 +0900)
committerhschang <chang@dev3>
Thu, 22 Jan 2015 07:19:04 +0000 (16:19 +0900)
365 files changed:
.gitmodules
Makefile
bitbake
meta-bsp/bm750/recipes/linux/linux-vuplus-3.1.1/.config [deleted file]
meta-bsp/bm750/recipes/linux/linux-vuplus-3.1.1/bm750_defconfig
meta-bsp/bm750/recipes/linux/linux-vuplus_3.1.1.bbappend
meta-bsp/common/conf/machine/include/vuplus.inc
meta-bsp/common/recipes/linux/linux-vuplus-3.1.1/kernel_miscompilation_with_gcc_4_8.patch [new file with mode: 0644]
meta-bsp/common/recipes/linux/linux-vuplus-3.3.8/kernel_miscompilation_with_gcc_4_8.patch [new file with mode: 0644]
meta-bsp/common/recipes/linux/linux-vuplus-3.9.6/rt2800usb_fix_warn_tx_status_timeout_to_dbg.patch [new file with mode: 0644]
meta-bsp/common/recipes/linux/linux-vuplus_2.6.37.bb
meta-bsp/common/recipes/linux/linux-vuplus_3.1.1.bb
meta-bsp/common/recipes/linux/linux-vuplus_3.3.6.bb
meta-bsp/common/recipes/linux/linux-vuplus_3.3.8.bb
meta-bsp/common/recipes/linux/linux-vuplus_3.9.6.bb
meta-bsp/vuduo2/recipes/linux/linux-vuplus_2.6.37.bbappend
meta-bsp/vuduo2/recipes/linux/linux-vuplus_3.3.8.bbappend
meta-bsp/vusolo/recipes/linux/linux-vuplus-3.1.1/vusolo_defconfig
meta-bsp/vusolo/recipes/linux/linux-vuplus_3.1.1.bbappend
meta-bsp/vusolo/recipes/vuplus/enigma2.bbappend
meta-bsp/vusolo2/recipes/linux/linux-vuplus_3.3.6.bbappend
meta-bsp/vuultimo/recipes/linux/linux-vuplus-3.1.1/vuultimo_defconfig
meta-bsp/vuultimo/recipes/linux/linux-vuplus_3.1.1.bbappend
meta-bsp/vuuno/recipes/linux/linux-vuplus-3.1.1/vuuno_defconfig
meta-bsp/vuuno/recipes/linux/linux-vuplus_3.1.1.bbappend
meta-openembedded
meta-openvuplus/classes/autotools.bbclass [deleted file]
meta-openvuplus/conf/distro/vuplus.conf
meta-openvuplus/recipes-connectivity/autofs/autofs_4.1.4.bb
meta-openvuplus/recipes-connectivity/bridge-utils/bridge-utils.inc [deleted file]
meta-openvuplus/recipes-connectivity/bridge-utils/bridge-utils/kernel-headers.patch [deleted file]
meta-openvuplus/recipes-connectivity/bridge-utils/bridge-utils_1.5.bb [deleted file]
meta-openvuplus/recipes-connectivity/djmount/djmount_0.71.bb
meta-openvuplus/recipes-connectivity/fuse/curlftpfs_0.9.2.bb
meta-openvuplus/recipes-connectivity/hostap/hostap-daemon-0.7.3/defconfig [deleted file]
meta-openvuplus/recipes-connectivity/hostap/hostap-daemon-0.7.3/init [deleted file]
meta-openvuplus/recipes-connectivity/hostap/hostap-daemon-0.7.inc [deleted file]
meta-openvuplus/recipes-connectivity/hostap/hostap-daemon_0.7.3.bb [deleted file]
meta-openvuplus/recipes-connectivity/hostapd/hostapd_2.%.bbappend [new file with mode: 0644]
meta-openvuplus/recipes-connectivity/minidlna/minidlna_cvs.bb
meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/configure-targets.patch [deleted file]
meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/ca.patch [deleted file]
meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/config-hurd.patch [deleted file]
meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/debian-targets.patch [deleted file]
meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/engines-path.patch [deleted file]
meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/kfreebsd-pipe.patch [deleted file]
meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/make-targets.patch [deleted file]
meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/man-dir.patch [deleted file]
meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/man-section.patch [deleted file]
meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/no-rpath.patch [deleted file]
meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/no-symbolic.patch [deleted file]
meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/perl-path.diff [deleted file]
meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/pic.patch [deleted file]
meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/pkg-config.patch [deleted file]
meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/rc4-amd64.patch [deleted file]
meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/rehash-crt.patch [deleted file]
meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/rehash_pod.patch [deleted file]
meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/series [deleted file]
meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/shared-lib-ext.patch [deleted file]
meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/stddef.patch [deleted file]
meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/version-script.patch [deleted file]
meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/find.pl [deleted file]
meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/parallel-make-fix.patch [deleted file]
meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/shared-libs.patch [deleted file]
meta-openvuplus/recipes-connectivity/openssl/openssl_0.9.8x.bb [deleted file]
meta-openvuplus/recipes-connectivity/packagegroups/packagegroup-vuplus-wlan.bb [new file with mode: 0644]
meta-openvuplus/recipes-connectivity/ppp/ppp_2.4.5.bbappend [deleted file]
meta-openvuplus/recipes-connectivity/ppp/ppp_2.4.6.bbappend [new file with mode: 0644]
meta-openvuplus/recipes-connectivity/realtek/r8192cu-3.1.2590.20110922/linux_3.1.patch [deleted file]
meta-openvuplus/recipes-connectivity/realtek/r8192cu-3.1.2590.20110922/makefile.patch [deleted file]
meta-openvuplus/recipes-connectivity/realtek/r8192cu-3.1.2590.20110922/rtl8192_8188CU_linux_v3.1.2590.20110922.tar.gz [deleted file]
meta-openvuplus/recipes-connectivity/realtek/r8192cu-3.4.4.4749.20121105/r8192cu_build_fix.patch [deleted file]
meta-openvuplus/recipes-connectivity/realtek/r8192cu-3.4.4.4749.20121105/rtl8188C_8192C_usb_linux_v3.4.4_4749.20121105.tar.gz [deleted file]
meta-openvuplus/recipes-connectivity/realtek/r8192cu_3.1.2590.20110922.bb [deleted file]
meta-openvuplus/recipes-connectivity/realtek/r8192cu_3.4.4.4749.20121105.bb [deleted file]
meta-openvuplus/recipes-connectivity/realtek/r8712u/config [deleted file]
meta-openvuplus/recipes-connectivity/realtek/r8712u/strcasecmp.patch [deleted file]
meta-openvuplus/recipes-connectivity/realtek/r8712u_2.6.6.0.20101111.bb [deleted file]
meta-openvuplus/recipes-connectivity/rt73-firmware/rt73-firmware_1.8.bb
meta-openvuplus/recipes-connectivity/samba/samba-basic.inc [new file with mode: 0644]
meta-openvuplus/recipes-connectivity/samba/samba.inc [new file with mode: 0644]
meta-openvuplus/recipes-connectivity/samba/samba_3.0.37.bb
meta-openvuplus/recipes-connectivity/samba/samba_3.0.37.bbappend
meta-openvuplus/recipes-connectivity/tasks/task-vuplus-wlan.bb [deleted file]
meta-openvuplus/recipes-connectivity/usb-modeswitch/usb-modeswitch-data_20121109.bb
meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/01-builddefs.patch [deleted file]
meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/02-config.patch [deleted file]
meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/03-db-doc.patch [deleted file]
meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/04-link-local.patch [deleted file]
meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/05-whitespaces.patch [deleted file]
meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/06-greedy.patch [deleted file]
meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/07-utf8.patch [deleted file]
meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/08-manpage.patch [deleted file]
meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/09-s390.patch [deleted file]
meta-openvuplus/recipes-connectivity/vsftpd/vsftpd/10-remote-dos.patch [deleted file]
meta-openvuplus/recipes-connectivity/vsftpd/vsftpd_2.3.5.bb [deleted file]
meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/action_wpa.sh [deleted file]
meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/functions.sh [deleted file]
meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/ifupdown.sh [deleted file]
meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_action [deleted file]
meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_action.8 [deleted file]
meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant/action_wpa.sh [new file with mode: 0644]
meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant/functions.sh [new file with mode: 0644]
meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant/ifupdown.sh [new file with mode: 0644]
meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_action [new file with mode: 0644]
meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_action.8 [new file with mode: 0644]
meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bbappend [deleted file]
meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.%.bbappend [new file with mode: 0644]
meta-openvuplus/recipes-connectivity/wvdial/wvdial-1.60/wvdial-vuplus_001.patch [deleted file]
meta-openvuplus/recipes-connectivity/wvdial/wvdial-1.61/wvdial-vuplus_001.patch [new file with mode: 0644]
meta-openvuplus/recipes-connectivity/wvdial/wvdial_1.60.bb [deleted file]
meta-openvuplus/recipes-connectivity/wvdial/wvdial_1.61.bbappend [new file with mode: 0644]
meta-openvuplus/recipes-connectivity/wvstream/wvstreams-4.6/vuplus-wvstreams-build-fix.patch [deleted file]
meta-openvuplus/recipes-connectivity/wvstream/wvstreams_4.6.bb [deleted file]
meta-openvuplus/recipes-connectivity/zeroconf/zeroconf_0.9.bbappend [deleted file]
meta-openvuplus/recipes-core/base-files/base-files/issue [deleted file]
meta-openvuplus/recipes-core/base-files/base-files/issue.net [deleted file]
meta-openvuplus/recipes-core/base-files/base-files_3.0.14.bbappend
meta-openvuplus/recipes-core/busybox/busybox-1.19.4/0001-ifupdown-support-post-up-pre-down-hooks.patch [deleted file]
meta-openvuplus/recipes-core/busybox/busybox-1.19.4/0001-work-around-linux-ext2_fs.h-breakage.patch [deleted file]
meta-openvuplus/recipes-core/busybox/busybox-1.19.4/0002-Create-and-use-our-own-copy-of-linux-ext2_fs.h.patch [deleted file]
meta-openvuplus/recipes-core/busybox/busybox-1.19.4/0002-ifupdown-code-shrink.patch [deleted file]
meta-openvuplus/recipes-core/busybox/busybox-1.19.4/0003-Drop-include-bb_linux_ext2_fs.h-use-existing-e2fspro.patch [deleted file]
meta-openvuplus/recipes-core/busybox/busybox-1.19.4/0003-ifupdown-remove-interface-from-state_list-if-iface_u.patch [deleted file]
meta-openvuplus/recipes-core/busybox/busybox-1.19.4/0004-ifupdown-support-metric-for-static-default-gw.patch [deleted file]
meta-openvuplus/recipes-core/busybox/busybox-1.19.4/0005-ifupdown-improve-compatibility-with-Debian.patch [deleted file]
meta-openvuplus/recipes-core/busybox/busybox-1.19.4/0006-get_linux_version_code-don-t-fail-on-3.0-foo.patch [deleted file]
meta-openvuplus/recipes-core/busybox/busybox-1.19.4/0007-ifplugd-move-read_pid-to-libbb-pidfile.c-and-rename-.patch [deleted file]
meta-openvuplus/recipes-core/busybox/busybox-1.19.4/0008-ifupdown-dhcp_down-wait-until-udhcpc-has-been-killed.patch [deleted file]
meta-openvuplus/recipes-core/busybox/busybox-1.19.4/0009-udhcpc-calculate-broadcast-address-if-not-given-by-s.patch [deleted file]
meta-openvuplus/recipes-core/busybox/busybox-1.19.4/0010-udhcpc-obtain-hostname-from-OS-by-default.patch [deleted file]
meta-openvuplus/recipes-core/busybox/busybox-1.19.4/0011-mount-don-t-pass-option-auto-to-kernel.patch [deleted file]
meta-openvuplus/recipes-core/busybox/busybox-1.19.4/change-passwd-default-algorithm.patch [deleted file]
meta-openvuplus/recipes-core/busybox/busybox-1.19.4/defconfig [deleted file]
meta-openvuplus/recipes-core/busybox/busybox-1.19.4/inetd [deleted file]
meta-openvuplus/recipes-core/busybox/busybox-1.19.4/inetd.conf [deleted file]
meta-openvuplus/recipes-core/busybox/busybox-1.19.4/mount_single_uuid.patch [deleted file]
meta-openvuplus/recipes-core/busybox/busybox-1.22.1/0011-mount-don-t-pass-option-auto-to-kernel.patch [new file with mode: 0644]
meta-openvuplus/recipes-core/busybox/busybox-1.22.1/defconfig [new file with mode: 0644]
meta-openvuplus/recipes-core/busybox/busybox-1.22.1/inetd [new file with mode: 0755]
meta-openvuplus/recipes-core/busybox/busybox-1.22.1/inetd.conf [new file with mode: 0644]
meta-openvuplus/recipes-core/busybox/busybox-1.22.1/mount_single_uuid.patch [new file with mode: 0644]
meta-openvuplus/recipes-core/busybox/busybox_1.19.4.bbappend [deleted file]
meta-openvuplus/recipes-core/busybox/busybox_1.22.1.bbappend [new file with mode: 0644]
meta-openvuplus/recipes-core/dbus/dbus-1.4.16/compile-under-c++11.patch [deleted file]
meta-openvuplus/recipes-core/dbus/dbus_1.4.16.bbappend [deleted file]
meta-openvuplus/recipes-core/gettext/gettext/gettext_remove_gets.patch [deleted file]
meta-openvuplus/recipes-core/gettext/gettext_0.18.1.1.bbappend [deleted file]
meta-openvuplus/recipes-core/init-ifupdown/init-ifupdown/interfaces [new file with mode: 0644]
meta-openvuplus/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend [new file with mode: 0644]
meta-openvuplus/recipes-core/initscripts/initscripts-1.0/bootmisc.sh [new file with mode: 0644]
meta-openvuplus/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
meta-openvuplus/recipes-core/initscripts/initscripts-1.0/volatiles [new file with mode: 0644]
meta-openvuplus/recipes-core/initscripts/initscripts_1.0.bbappend
meta-openvuplus/recipes-core/meta/distro-feed-configs.bbappend
meta-openvuplus/recipes-core/netbase/netbase/interfaces [deleted file]
meta-openvuplus/recipes-core/netbase/netbase_4.47.bbappend [deleted file]
meta-openvuplus/recipes-core/packagegroup/packagegroup-core-boot.bbappend [new file with mode: 0644]
meta-openvuplus/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend
meta-openvuplus/recipes-core/tasks/task-core-boot.bb [deleted file]
meta-openvuplus/recipes-core/tasks/task-core-boot.inc [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/40-od-devfs-compatibility.rules [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/41-od-linux-2.6.18-misc.rules [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/42-od-oled-compatibility.rules [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/default [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/devfs-udev.rules [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/flags.patch [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/init [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/libvolume-id-soname.patch [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/links.conf [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/local.rules [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/mount.blacklist [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/mount.sh [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/mtd-exclude-persistent.patch [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/network.sh [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/noasmlinkage.patch [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/permissions.rules [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/run.rules [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/series [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/udev.rules [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/udevtrigger_add_devname_filtering.patch [deleted file]
meta-openvuplus/recipes-core/udev/udev-124/vol_id_ld.patch [deleted file]
meta-openvuplus/recipes-core/udev/udev-182/99_vuplus.rules [new file with mode: 0644]
meta-openvuplus/recipes-core/udev/udev-182/init [new file with mode: 0644]
meta-openvuplus/recipes-core/udev/udev_124.bb [deleted file]
meta-openvuplus/recipes-core/udev/udev_124.inc [deleted file]
meta-openvuplus/recipes-core/udev/udev_182.bbappend [new file with mode: 0644]
meta-openvuplus/recipes-daemon/vsftpd/vsftpd-3.0.2/login-blank-password.patch [new file with mode: 0644]
meta-openvuplus/recipes-daemon/vsftpd/vsftpd-3.0.2/makefile-destdir.patch [new file with mode: 0644]
meta-openvuplus/recipes-daemon/vsftpd/vsftpd-3.0.2/makefile-libs.patch [new file with mode: 0644]
meta-openvuplus/recipes-daemon/vsftpd/vsftpd-3.0.2/makefile-strip.patch [new file with mode: 0644]
meta-openvuplus/recipes-daemon/vsftpd/vsftpd-3.0.2/nopam-with-tcp_wrappers.patch [new file with mode: 0644]
meta-openvuplus/recipes-daemon/vsftpd/vsftpd-3.0.2/nopam.patch [new file with mode: 0644]
meta-openvuplus/recipes-daemon/vsftpd/vsftpd-3.0.2/vsftpd-tcp_wrappers-support.patch [new file with mode: 0644]
meta-openvuplus/recipes-daemon/vsftpd/vsftpd-3.0.2/vsftpd.conf [new file with mode: 0644]
meta-openvuplus/recipes-daemon/vsftpd/vsftpd_3.0.2.bb [new file with mode: 0644]
meta-openvuplus/recipes-devtools/bison/bison/bison_remove_gets.patch [deleted file]
meta-openvuplus/recipes-devtools/bison/bison_2.5.bbappend [deleted file]
meta-openvuplus/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bbappend [deleted file]
meta-openvuplus/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bbappend [new file with mode: 0644]
meta-openvuplus/recipes-devtools/gdb/gdb-cross_7.4.bbappend [deleted file]
meta-openvuplus/recipes-devtools/gdb/gdb_7.4.bbappend [deleted file]
meta-openvuplus/recipes-devtools/ltrace/ltrace/0001-breakpoints.c-fix-compile-for-mips.patch [deleted file]
meta-openvuplus/recipes-devtools/ltrace/ltrace/ltrace_fix_compile_error_initialize_linkmap.patch [new file with mode: 0644]
meta-openvuplus/recipes-devtools/ltrace/ltrace_git.bb [deleted file]
meta-openvuplus/recipes-devtools/ltrace/ltrace_git.bbappend [new file with mode: 0644]
meta-openvuplus/recipes-devtools/m4/m4-native/m4_remove_gets.patch [deleted file]
meta-openvuplus/recipes-devtools/m4/m4-native_1.4.16.bbappend [deleted file]
meta-openvuplus/recipes-devtools/mtd/files/mkfs.ubifs-allow-output-file-creation-on-different-device.patch [new file with mode: 0644]
meta-openvuplus/recipes-devtools/mtd/mtd-utils-1.4.9/mkfs.ubifs-allow-output-file-creation-on-different-device.patch [deleted file]
meta-openvuplus/recipes-devtools/mtd/mtd-utils_1.4.9.bbappend [deleted file]
meta-openvuplus/recipes-devtools/mtd/mtd-utils_git.bbappend [new file with mode: 0644]
meta-openvuplus/recipes-devtools/opkg/opkg-collateral.bbappend [deleted file]
meta-openvuplus/recipes-devtools/opkg/opkg-collateral/dest [deleted file]
meta-openvuplus/recipes-devtools/opkg/opkg-collateral/lists [deleted file]
meta-openvuplus/recipes-devtools/opkg/opkg/0001-Fixed-opkg-losing-auto_installed-flag-on-upgrading.patch [deleted file]
meta-openvuplus/recipes-devtools/opkg/opkg/0001-pkg_hash_fetch_conflicts-move-iteration-over-conflic.patch [new file with mode: 0644]
meta-openvuplus/recipes-devtools/opkg/opkg/0002-Don-t-mark-Conflicts-as-Depends.patch [deleted file]
meta-openvuplus/recipes-devtools/opkg/opkg/0002-pkg_hash_fetch_conflicts-take-into-account-conflicts.patch [new file with mode: 0644]
meta-openvuplus/recipes-devtools/opkg/opkg/0003-Statically-link-libopkg-and-libbb.patch [deleted file]
meta-openvuplus/recipes-devtools/opkg/opkg/0003-opkg_remove-auto-delete-.pyo-files.patch [new file with mode: 0644]
meta-openvuplus/recipes-devtools/opkg/opkg/0005-pkg_depends-remove-unused-variables-to-fix-compiler-.patch [deleted file]
meta-openvuplus/recipes-devtools/opkg/opkg/0006-pkg_hash_fetch_conflicts-fix-possible-segfaults.patch [deleted file]
meta-openvuplus/recipes-devtools/opkg/opkg/0007-pkg_hash_fetch_conflicts-move-iteration-over-conflic.patch [deleted file]
meta-openvuplus/recipes-devtools/opkg/opkg/0008-pkg_hash_fetch_conflicts-take-into-account-conflicts.patch [deleted file]
meta-openvuplus/recipes-devtools/opkg/opkg/0009-don-t-add-recommends-pkgs-to-depended-upon-by.patch [deleted file]
meta-openvuplus/recipes-devtools/opkg/opkg/0010-opkg_remove-auto-delete-.pyo-files.patch [deleted file]
meta-openvuplus/recipes-devtools/opkg/opkg/0011-opkg-allow-package-move-from-depends-to-recommends.patch [deleted file]
meta-openvuplus/recipes-devtools/opkg/opkg/0012-opkg-dont-handle-recommends-as-depends.patch [deleted file]
meta-openvuplus/recipes-devtools/opkg/opkg/unarchive-fixed-uname-gname-cache.patch [deleted file]
meta-openvuplus/recipes-devtools/opkg/opkg_0.2.4.bbappend [new file with mode: 0644]
meta-openvuplus/recipes-devtools/opkg/opkg_svn.bbappend [deleted file]
meta-openvuplus/recipes-devtools/orc/orc/disable-mips.patch [new file with mode: 0644]
meta-openvuplus/recipes-devtools/orc/orc_0.4.18.bbappend [new file with mode: 0644]
meta-openvuplus/recipes-devtools/python/python-native/04-default-is-optimized.patch [new file with mode: 0644]
meta-openvuplus/recipes-devtools/python/python-native_2.7.2.bbappend [deleted file]
meta-openvuplus/recipes-devtools/python/python-native_2.7.3.bbappend [new file with mode: 0644]
meta-openvuplus/recipes-devtools/python/python-pycrypto_2.5.bb
meta-openvuplus/recipes-devtools/python/python-transmissionrpc_hg.bb
meta-openvuplus/recipes-devtools/python/python-twisted_12.0.0.bb [deleted file]
meta-openvuplus/recipes-devtools/python/python-twisted_13.2.%.bbappend [new file with mode: 0644]
meta-openvuplus/recipes-devtools/python/python-zopeinterface_4.%.bbappend [new file with mode: 0644]
meta-openvuplus/recipes-devtools/python/python/04-default-is-optimized.patch [new file with mode: 0644]
meta-openvuplus/recipes-devtools/python/python/99-ignore-optimization-flag.patch [new file with mode: 0644]
meta-openvuplus/recipes-devtools/python/python/ctypes-error-handling-fix.patch
meta-openvuplus/recipes-devtools/python/python/fix_pthread_site.patch
meta-openvuplus/recipes-devtools/python/python/no-ldconfig.patch
meta-openvuplus/recipes-devtools/python/python/some_configure_fixes.patch
meta-openvuplus/recipes-devtools/python/python_2.7.2.bbappend [deleted file]
meta-openvuplus/recipes-devtools/python/python_2.7.3.bbappend [new file with mode: 0644]
meta-openvuplus/recipes-devtools/swig/swig_2.0.4.bb [deleted file]
meta-openvuplus/recipes-extended/ethtool/ethtool/vuplus.patch
meta-openvuplus/recipes-extended/ethtool/ethtool_2.6.36.bbappend [deleted file]
meta-openvuplus/recipes-extended/ethtool/ethtool_3.16.bbappend [new file with mode: 0644]
meta-openvuplus/recipes-extended/mc/mc-4.8.1/optional-extfs-dir.patch [deleted file]
meta-openvuplus/recipes-extended/mc/mc-4.8.1/optional-hints.patch [deleted file]
meta-openvuplus/recipes-extended/mc/mc-4.8.1/optional-sfs-ini.patch [deleted file]
meta-openvuplus/recipes-extended/mc/mc-4.8.1/optional-syntax-file.patch [deleted file]
meta-openvuplus/recipes-extended/mc/mc-4.8.12/optional-extfs-dir.patch [new file with mode: 0644]
meta-openvuplus/recipes-extended/mc/mc-4.8.12/optional-hints.patch [new file with mode: 0644]
meta-openvuplus/recipes-extended/mc/mc-4.8.12/optional-sfs-ini.patch [new file with mode: 0644]
meta-openvuplus/recipes-extended/mc/mc-4.8.12/optional-syntax-file.patch [new file with mode: 0644]
meta-openvuplus/recipes-extended/mc/mc_4.8.1.bbappend [deleted file]
meta-openvuplus/recipes-extended/mc/mc_4.8.12.bbappend [new file with mode: 0644]
meta-openvuplus/recipes-extended/procps/procps_3.2.8.bbappend [deleted file]
meta-openvuplus/recipes-extended/shadow/shadow-securetty_4.1.4.3.bbappend [deleted file]
meta-openvuplus/recipes-extended/shadow/shadow-securetty_4.2.1.bbappend [new file with mode: 0644]
meta-openvuplus/recipes-extended/shadow/shadow_4.%.bbappend [new file with mode: 0644]
meta-openvuplus/recipes-extended/shadow/shadow_4.1.4.3.bbappend [deleted file]
meta-openvuplus/recipes-extended/smartmontools/smartmontools.inc [deleted file]
meta-openvuplus/recipes-extended/smartmontools/smartmontools_5.42.bb [deleted file]
meta-openvuplus/recipes-extended/tzdata/tzdata_2012b.bbappend [deleted file]
meta-openvuplus/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_201%.bbappend [new file with mode: 0644]
meta-openvuplus/recipes-graphics/freetype/freetype_2.4.12.bb [new file with mode: 0644]
meta-openvuplus/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.31.bb
meta-openvuplus/recipes-kernel/linux-libc-headers/linux-libc-headers_3.1.bb
meta-openvuplus/recipes-kernel/linux-libc-headers/linux-libc-headers_3.3.bb
meta-openvuplus/recipes-kernel/linux-libc-headers/linux-libc-headers_3.9.bb
meta-openvuplus/recipes-multimedia/cdparanoia/cdparanoia_svn.bb
meta-openvuplus/recipes-multimedia/cdrkit/cdrkit-1.1.9/cdrkit-1.1.9-glibc-2.10-3.patch [deleted file]
meta-openvuplus/recipes-multimedia/cdrkit/cdrkit-1.1.9/xconfig.patch [deleted file]
meta-openvuplus/recipes-multimedia/cdrkit/cdrkit/xconfig.patch [new file with mode: 0644]
meta-openvuplus/recipes-multimedia/cdrkit/cdrkit_1.1.10.bb [new file with mode: 0644]
meta-openvuplus/recipes-multimedia/cdrkit/cdrkit_1.1.9.bb [deleted file]
meta-openvuplus/recipes-multimedia/gstreamer/gst-plugin-dvbmediasink_0.10.bb
meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.1.bb
meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bbappend
meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.1.bb
meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bbappend
meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.1.bb
meta-openvuplus/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.19.1.bb
meta-openvuplus/recipes-multimedia/gstreamer/gstreamer_0.10.36.1.bb
meta-openvuplus/recipes-multimedia/libav/libav_0.7.4.bbappend [deleted file]
meta-openvuplus/recipes-multimedia/libav/libav_0.8.%.bbappend [new file with mode: 0644]
meta-openvuplus/recipes-multimedia/libdvdnav/libdvdnav_svn.bb
meta-openvuplus/recipes-multimedia/libmusicbrainz/libmusicbrainz_git.bbappend [new file with mode: 0644]
meta-openvuplus/recipes-multimedia/libvorbis/libvorbis_1.3.3.bbappend [deleted file]
meta-openvuplus/recipes-multimedia/libvorbis/libvorbis_1.3.4.bbappend [new file with mode: 0644]
meta-openvuplus/recipes-multimedia/streamripper/streamripper_1.64.6.bb
meta-openvuplus/recipes-protocol/zeroconf/zeroconf_0.9.bbappend [new file with mode: 0644]
meta-openvuplus/recipes-support/libunwind/libunwind-1.0.1/0001-mips-compile-_UPTi_find_unwind_table.patch [deleted file]
meta-openvuplus/recipes-support/libunwind/libunwind.inc [deleted file]
meta-openvuplus/recipes-support/libunwind/libunwind_1.0.1.bb [deleted file]
meta-openvuplus/recipes-support/libxmlccwrap/files/use-pkgconfig.patch [new file with mode: 0644]
meta-openvuplus/recipes-support/libxmlccwrap/libxmlccwrap_0.0.12.bb
meta-openvuplus/recipes-support/sqlite/sqlite3_3.7.10.bbappend [deleted file]
meta-openvuplus/recipes-vuplus/aio-grab/aio-grab.bb
meta-openvuplus/recipes-vuplus/dreambox-keymaps/dreambox-keymaps.bb [deleted file]
meta-openvuplus/recipes-vuplus/dreambox-keymaps/dreambox-keymaps/GPL-1.0 [deleted file]
meta-openvuplus/recipes-vuplus/dreambox-keymaps/dreambox-keymaps/dream-de.info [deleted file]
meta-openvuplus/recipes-vuplus/dreambox-keymaps/dreambox-keymaps/dream-de.kmap [deleted file]
meta-openvuplus/recipes-vuplus/dreambox-keymaps/dreambox-keymaps/eng.info [deleted file]
meta-openvuplus/recipes-vuplus/dreambox-keymaps/dreambox-keymaps/eng.kmap [deleted file]
meta-openvuplus/recipes-vuplus/dvbsnoop/dvbsnoop.bb
meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-addstreamurl.bb
meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-openwebif.bb
meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-extensions-remotestreamconvert.bb
meta-openvuplus/recipes-vuplus/e2openplugins/enigma2-plugin-systemplugins-autoshutdown.bb
meta-openvuplus/recipes-vuplus/e2openplugins/files/autoshutdown-default-time_20121207.patch [deleted file]
meta-openvuplus/recipes-vuplus/e2openplugins/files/autoshutdown-fix-standby_20140407.patch [deleted file]
meta-openvuplus/recipes-vuplus/e2openplugins/files/autoshutdown-fix-standby_20141218.patch [new file with mode: 0644]
meta-openvuplus/recipes-vuplus/enigma2/enigma2-plugins.bb
meta-openvuplus/recipes-vuplus/enigma2/enigma2-skins.bb
meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy.bb
meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_addlibpythondeps.patch [deleted file]
meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_conversion_error.patch [new file with mode: 0644]
meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_default_arg_error.patch [new file with mode: 0644]
meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_epng.patch [new file with mode: 0644]
meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_eptrlist_insert.patch [new file with mode: 0644]
meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_remove_dreambox_enigma.patch
meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_wrong_boolean_type.patch [new file with mode: 0644]
meta-openvuplus/recipes-vuplus/fakelocale/fakelocale.bb
meta-openvuplus/recipes-vuplus/images/vuplus-image.bb
meta-openvuplus/recipes-vuplus/images/vuplus-image.inc
meta-openvuplus/recipes-vuplus/lcd4linux/lcd4linux_0.11.0-SVN.bb
meta-openvuplus/recipes-vuplus/libungif/libungif-native_4.1.3.bb [deleted file]
meta-openvuplus/recipes-vuplus/libungif/libungif_4.1.3.bb [deleted file]
meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.1.bb
meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.2.bb
meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-base.bb [new file with mode: 0644]
meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb [new file with mode: 0644]
meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-essential.bb [new file with mode: 0644]
meta-openvuplus/recipes-vuplus/tasks/task-vuplus-base.bb [deleted file]
meta-openvuplus/recipes-vuplus/tasks/task-vuplus-base.inc [deleted file]
meta-openvuplus/recipes-vuplus/tasks/task-vuplus-dvbapi3.bb [deleted file]
meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.bb [deleted file]
meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.inc [deleted file]
meta-openvuplus/recipes-vuplus/tasks/task-vuplus-essential.bb [deleted file]
meta-openvuplus/recipes-vuplus/tuxbox/tuxbox-common.bb
meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-libtuxtxt.bb
meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-libtuxtxt/libtuxtxt_buildfix.patch [new file with mode: 0644]
meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-tuxtxt-32bpp.bb
meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper.bb
meta-openvuplus/recipes-vuplus/usbtunerhelper/usbtunerhelper/GPL-2.0 [deleted file]
meta-openvuplus/recipes-vuplus/vuplus-coldboot/vuplus-coldboot.bb
meta-openvuplus/recipes-vuplus/vuplus-fpga-update/vuplus-fpga-update.bb
meta-openvuplus/recipes-vuplus/vuplus-makenfi-native/files/vfi2 [new file with mode: 0755]
meta-openvuplus/recipes-vuplus/vuplus-makenfi-native/files/vfi3 [new file with mode: 0755]
meta-openvuplus/recipes-vuplus/vuplus-makenfi-native/vuplus-makenfi-native.bb
meta-openvuplus/recipes-vuplus/vuplus-makenfi-native/vuplus-makenfi-native/vfi2 [deleted file]
meta-openvuplus/recipes-vuplus/vuplus-makenfi-native/vuplus-makenfi-native/vfi3 [deleted file]
meta-openvuplus/recipes-vuplus/vuplus-vucamd/vuplus-vucamd.bb
meta-openvuplus/recipes-vuplus/vuplus-vucamd/vuplus-vucamd/Proprietary [deleted file]
openembedded-core

index 5f3029f..5e8b44d 100644 (file)
@@ -1,9 +1,9 @@
 [submodule "openembedded-core"]
        path = openembedded-core
-       url = git://git.openembedded.org/openembedded-core-contrib
+       url = git://git.openembedded.org/openembedded-core
 [submodule "meta-openembedded"]
        path = meta-openembedded
-       url = git://git.openembedded.org/meta-openembedded-contrib
+       url = git://git.openembedded.org/meta-openembedded
 [submodule "bitbake"]
        path = bitbake
        url = git://git.openembedded.org/bitbake
index 95df253..394159a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@
 # for the vuultimo, if it is not the default.
 MACHINE ?= vusolose
 
-MULTI_TEMPORARILY ?= YES
+MULTI_TEMPORARILY ?= NO
 
 # Adjust according to the number CPU cores to use for parallel build.
 # Default: Number of processors in /proc/cpuinfo, if present, or 1.
@@ -60,6 +60,10 @@ BBLAYERS ?= \
        $(CURDIR)/meta-bsp/common \
        $(CURDIR)/meta-openvuplus \
        $(CURDIR)/meta-openembedded/meta-oe \
+       $(CURDIR)/meta-openembedded/meta-networking \
+       $(CURDIR)/meta-openembedded/meta-multimedia \
+       $(CURDIR)/meta-openembedded/meta-filesystems \
+       $(CURDIR)/meta-openembedded/meta-python \
        $(CURDIR)/openembedded-core/meta
 
 CONFFILES = \
diff --git a/bitbake b/bitbake
index 270a05b..9e27bb2 160000 (submodule)
--- a/bitbake
+++ b/bitbake
@@ -1 +1 @@
-Subproject commit 270a05b0b4ba0959fe0624d2a4885d7b70426da5
+Subproject commit 9e27bb2869e8ec6781d2f68d0585ebbf9ca6f3d8
diff --git a/meta-bsp/bm750/recipes/linux/linux-vuplus-3.1.1/.config b/meta-bsp/bm750/recipes/linux/linux-vuplus-3.1.1/.config
deleted file mode 100644 (file)
index fe8a00b..0000000
+++ /dev/null
@@ -1,2685 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/mips 3.1.1 Kernel Configuration
-#
-CONFIG_MIPS=y
-
-#
-# Machine selection
-#
-# CONFIG_MIPS_ALCHEMY is not set
-# CONFIG_AR7 is not set
-# CONFIG_ATH79 is not set
-# CONFIG_BCM47XX is not set
-# CONFIG_BCM63XX is not set
-CONFIG_BRCMSTB=y
-# CONFIG_MIPS_COBALT is not set
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_MACH_JZ4740 is not set
-# CONFIG_LANTIQ is not set
-# CONFIG_LASAT is not set
-# CONFIG_MACH_LOONGSON is not set
-# CONFIG_MIPS_MALTA is not set
-# CONFIG_MIPS_SIM is not set
-# CONFIG_NEC_MARKEINS is not set
-# CONFIG_MACH_VR41XX is not set
-# CONFIG_NXP_STB220 is not set
-# CONFIG_NXP_STB225 is not set
-# CONFIG_PNX8550_JBS is not set
-# CONFIG_PNX8550_STB810 is not set
-# CONFIG_PMC_MSP is not set
-# CONFIG_PMC_YOSEMITE is not set
-# CONFIG_POWERTV is not set
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP28 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SNI_RM is not set
-# CONFIG_MACH_TX39XX is not set
-# CONFIG_MACH_TX49XX is not set
-# CONFIG_MIKROTIK_RB532 is not set
-# CONFIG_WR_PPMC is not set
-# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
-# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
-# CONFIG_NLM_XLR_BOARD is not set
-# CONFIG_ALCHEMY_GPIO_INDIRECT is not set
-
-#
-# Broadcom STB options
-#
-# CONFIG_BRCM_LEGACY is not set
-# CONFIG_BCM3548B0 is not set
-# CONFIG_BCM35125A0 is not set
-# CONFIG_BCM35230C0 is not set
-# CONFIG_BCM35330A0 is not set
-# CONFIG_BCM7125C0 is not set
-# CONFIG_BCM7135A0 is not set
-# CONFIG_BCM7231A0 is not set
-# CONFIG_BCM7325B0 is not set
-CONFIG_BCM7335B0=y
-# CONFIG_BCM7340B0 is not set
-# CONFIG_BCM7342B0 is not set
-# CONFIG_BCM7344A0 is not set
-# CONFIG_BCM7346A0 is not set
-# CONFIG_BCM7358A0 is not set
-# CONFIG_BCM7405B0 is not set
-# CONFIG_BCM7405D0 is not set
-# CONFIG_BCM7408B0 is not set
-# CONFIG_BCM7420C0 is not set
-# CONFIG_BCM7422A0 is not set
-# CONFIG_BCM7425A0 is not set
-# CONFIG_BCM7468B0 is not set
-# CONFIG_BCM7550A0 is not set
-# CONFIG_BCM7550B0 is not set
-# CONFIG_BCM7552A0 is not set
-# CONFIG_BCM7601B0 is not set
-# CONFIG_BCM7630B0 is not set
-# CONFIG_BCM7631B0 is not set
-# CONFIG_BCM7635A0 is not set
-# CONFIG_BCM7640A0 is not set
-
-#
-# Memory map
-#
-# CONFIG_BRCM_UPPER_MEMORY is not set
-# CONFIG_BRCM_OVERRIDE_RAM_SIZE is not set
-
-#
-# Onchip peripherals
-#
-CONFIG_BRCM_CONSOLE_DEVICE=0
-CONFIG_BRCM_FLASH=y
-CONFIG_BRCM_FIXED_MTD_PARTITIONS=y
-CONFIG_MTD_BRCMNAND=y
-CONFIG_BRCMNAND_MTD_EXTENSION=y
-# CONFIG_MTD_BRCMNAND_VERIFY_WRITE is not set
-# CONFIG_MTD_BRCMNAND_CORRECTABLE_ERR_HANDLING is not set
-CONFIG_BCMEMAC=y
-CONFIG_SATA_BRCMSTB=y
-CONFIG_BRCM_USB=y
-# CONFIG_BRCM_OVERRIDE_USB is not set
-CONFIG_BRCM_PM=y
-CONFIG_CSRC_UPG=y
-
-#
-# Miscellaneous options
-#
-# CONFIG_BRCM_FORCE_DOCSIS is not set
-CONFIG_BRCM_LIBGCC=y
-# CONFIG_BRCM_SCSI_NO_RW10_RETRIES is not set
-# CONFIG_BRCM_DEBUG_OPTIONS is not set
-CONFIG_BMIPS4380=y
-CONFIG_BRCM_HAS_16550=y
-CONFIG_BRCM_HAS_UARTA=y
-CONFIG_BRCM_HAS_UARTB=y
-CONFIG_BRCM_HAS_UARTC=y
-CONFIG_BRCM_UARTA_IS_16550=y
-CONFIG_BRCM_UARTB_IS_16550=y
-CONFIG_BRCM_UARTC_IS_16550=y
-CONFIG_BRCM_HAS_PCI23=y
-CONFIG_BRCM_HAS_EMAC_0=y
-CONFIG_BRCM_HAS_EMAC_1=y
-CONFIG_BRCM_HAS_SATA=y
-CONFIG_BRCM_HAS_SATA2=y
-# CONFIG_BRCM_SATA_75MHZ_PLL is not set
-# CONFIG_BRCM_SATA_SINGLE_PORT is not set
-CONFIG_BRCM_HAS_NOR=y
-CONFIG_BRCM_HAS_NAND_MINOR_1=y
-CONFIG_BRCM_HAS_NAND_MAJOR_2=y
-CONFIG_BRCMNAND_MAJOR_VERS=2
-CONFIG_BRCMNAND_MINOR_VERS=1
-CONFIG_BRCM_HAS_NAND=y
-CONFIG_BRCM_CPU_DIV=y
-CONFIG_BRCM_HAS_UPPER_MEMORY=y
-CONFIG_BRCM_HAS_1GB_MEMC0=y
-CONFIG_BRCM_PLATFORM_DEFAULTS=y
-CONFIG_BCM7335=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_ARCH_SUPPORTS_OPROFILE=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_BOOT_RAW=y
-CONFIG_CEVT_R4K_LIB=y
-CONFIG_CEVT_R4K=y
-CONFIG_CFE=y
-# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
-CONFIG_DMA_NONCOHERENT=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_SYS_HAS_EARLY_PRINTK=y
-# CONFIG_HOTPLUG_CPU is not set
-CONFIG_SYS_SUPPORTS_HOTPLUG_CPU=y
-# CONFIG_MIPS_MACHINE is not set
-# CONFIG_NO_IOPORT is not set
-# CONFIG_CPU_BIG_ENDIAN is not set
-CONFIG_CPU_LITTLE_ENDIAN=y
-CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
-CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
-CONFIG_IRQ_CPU=y
-CONFIG_SWAP_IO_SPACE=y
-CONFIG_MIPS_L1_CACHE_SHIFT=5
-
-#
-# CPU selection
-#
-CONFIG_CPU_MIPS32_R1=y
-CONFIG_SYS_HAS_CPU_MIPS32_R1=y
-CONFIG_WEAK_ORDERING=y
-CONFIG_CPU_MIPS32=y
-CONFIG_CPU_MIPSR1=y
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_HARDWARE_WATCHPOINTS=y
-
-#
-# Kernel type
-#
-CONFIG_32BIT=y
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_16KB is not set
-# CONFIG_PAGE_SIZE_64KB is not set
-CONFIG_FORCE_MAX_ZONEORDER=11
-CONFIG_CPU_HAS_PREFETCH=y
-CONFIG_MIPS_MT_DISABLED=y
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
-CONFIG_CPU_HAS_SYNC=y
-CONFIG_CPU_SUPPORTS_HIGHMEM=y
-CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_COMPACTION is not set
-# CONFIG_PHYS_ADDR_T_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=0
-CONFIG_VIRT_TO_BUS=y
-# CONFIG_KSM is not set
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-# CONFIG_CLEANCACHE is not set
-CONFIG_SMP=y
-CONFIG_SYS_SUPPORTS_SMP=y
-CONFIG_NR_CPUS=2
-CONFIG_TICK_ONESHOT=y
-# CONFIG_NO_HZ is not set
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-# CONFIG_HZ_48 is not set
-# CONFIG_HZ_100 is not set
-# CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_256 is not set
-CONFIG_HZ_1000=y
-# CONFIG_HZ_1024 is not set
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_HZ=1000
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-# CONFIG_KEXEC is not set
-# CONFIG_SECCOMP is not set
-# CONFIG_USE_OF is not set
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_HAVE_IRQ_WORK=y
-
-#
-# General setup
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_DEFAULT_HOSTNAME="(none)"
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_FHANDLE is not set
-# CONFIG_TASKSTATS is not set
-# CONFIG_AUDIT is not set
-CONFIG_HAVE_GENERIC_HARDIRQS=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_IRQ_FORCED_THREADING=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU=y
-# CONFIG_PREEMPT_RCU is not set
-# CONFIG_RCU_TRACE is not set
-CONFIG_RCU_FANOUT=32
-# CONFIG_RCU_FANOUT_EXACT is not set
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_IKCONFIG is not set
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_CGROUPS is not set
-# CONFIG_NAMESPACES is not set
-# CONFIG_SCHED_AUTOGROUP is not set
-CONFIG_SYSFS_DEPRECATED=y
-CONFIG_SYSFS_DEPRECATED_V2=y
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_RD_GZIP=y
-# CONFIG_RD_BZIP2 is not set
-# CONFIG_RD_LZMA is not set
-# CONFIG_RD_XZ is not set
-# CONFIG_RD_LZO is not set
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
-CONFIG_EXPERT=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_EMBEDDED=y
-CONFIG_HAVE_PERF_EVENTS=y
-CONFIG_PERF_USE_VMALLOC=y
-
-#
-# Kernel Performance Events And Counters
-#
-# CONFIG_PERF_EVENTS is not set
-# CONFIG_PERF_COUNTERS is not set
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_PCI_QUIRKS=y
-CONFIG_COMPAT_BRK=y
-CONFIG_SLAB=y
-# CONFIG_SLUB is not set
-# CONFIG_SLOB is not set
-# CONFIG_PROFILING is not set
-CONFIG_HAVE_OPROFILE=y
-# CONFIG_KPROBES is not set
-# CONFIG_JUMP_LABEL is not set
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_DMA_ATTRS=y
-CONFIG_USE_GENERIC_SMP_HELPERS=y
-CONFIG_HAVE_DMA_API_DEBUG=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-
-#
-# GCOV-based kernel profiling
-#
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_SLABINFO=y
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_STOP_MACHINE=y
-CONFIG_BLOCK=y
-CONFIG_LBDAF=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_BLK_DEV_BSGLIB is not set
-# CONFIG_BLK_DEV_INTEGRITY is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-# CONFIG_IOSCHED_DEADLINE is not set
-CONFIG_IOSCHED_CFQ=y
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-CONFIG_INLINE_SPIN_UNLOCK=y
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-CONFIG_INLINE_READ_UNLOCK=y
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-CONFIG_INLINE_WRITE_UNLOCK=y
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-# CONFIG_FREEZER is not set
-
-#
-# Bus options (PCI, PCMCIA, EISA, ISA, TC)
-#
-CONFIG_HW_HAS_PCI=y
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-# CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_STUB is not set
-# CONFIG_PCI_IOV is not set
-CONFIG_MMU=y
-# CONFIG_PCCARD is not set
-# CONFIG_HOTPLUG_PCI is not set
-# CONFIG_RAPIDIO is not set
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-# CONFIG_HAVE_AOUT is not set
-# CONFIG_BINFMT_MISC is not set
-CONFIG_TRAD_SIGNALS=y
-
-#
-# Power management options
-#
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# CONFIG_SUSPEND is not set
-# CONFIG_HIBERNATION is not set
-# CONFIG_PM_RUNTIME is not set
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-# CONFIG_XFRM_USER is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-CONFIG_XFRM_IPCOMP=m
-# CONFIG_NET_KEY is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE_DEMUX is not set
-# CONFIG_IP_MROUTE is not set
-# CONFIG_ARPD is not set
-# CONFIG_SYN_COOKIES is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
-CONFIG_INET_TUNNEL=m
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
-CONFIG_IPV6=m
-CONFIG_IPV6_PRIVACY=y
-CONFIG_IPV6_ROUTER_PREF=y
-# CONFIG_IPV6_ROUTE_INFO is not set
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_IPV6_SIT=m
-# CONFIG_IPV6_SIT_6RD is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-# CONFIG_IPV6_MULTIPLE_TABLES is not set
-CONFIG_IPV6_MROUTE=y
-# CONFIG_IPV6_MROUTE_MULTIPLE_TABLES is not set
-CONFIG_IPV6_PIMSM_V2=y
-# CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-# CONFIG_NETFILTER is not set
-# CONFIG_IP_DCCP is not set
-# CONFIG_IP_SCTP is not set
-# CONFIG_RDS is not set
-# CONFIG_TIPC is not set
-# CONFIG_ATM is not set
-# CONFIG_L2TP is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_NET_DSA is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_PHONET is not set
-# CONFIG_IEEE802154 is not set
-# CONFIG_NET_SCHED is not set
-# CONFIG_DCB is not set
-# CONFIG_BATMAN_ADV is not set
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
-# CONFIG_IRDA is not set
-CONFIG_BT=y
-CONFIG_BT_L2CAP=y
-# CONFIG_BT_SCO is not set
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-# CONFIG_BT_BNEP_MC_FILTER is not set
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=y
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIBTUSB=y
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-# CONFIG_BT_HCIUART_ATH3K is not set
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIVHCI=m
-# CONFIG_BT_MRVL is not set
-# CONFIG_BT_ATH3K is not set
-# CONFIG_AF_RXRPC is not set
-CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WEXT_PRIV=y
-CONFIG_CFG80211=y
-# CONFIG_NL80211_TESTMODE is not set
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_REG_DEBUG is not set
-CONFIG_CFG80211_DEFAULT_PS=y
-# CONFIG_CFG80211_INTERNAL_REGDB is not set
-CONFIG_CFG80211_WEXT=y
-CONFIG_WIRELESS_EXT_SYSFS=y
-CONFIG_LIB80211=y
-CONFIG_LIB80211_CRYPT_WEP=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_MAC80211=m
-CONFIG_MAC80211_HAS_RC=y
-# CONFIG_MAC80211_RC_PID is not set
-CONFIG_MAC80211_RC_MINSTREL=y
-CONFIG_MAC80211_RC_MINSTREL_HT=y
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
-# CONFIG_MAC80211_MESH is not set
-CONFIG_MAC80211_LEDS=y
-# CONFIG_MAC80211_DEBUG_MENU is not set
-# CONFIG_WIMAX is not set
-# CONFIG_RFKILL is not set
-# CONFIG_NET_9P is not set
-# CONFIG_CAIF is not set
-# CONFIG_CEPH_LIB is not set
-# CONFIG_NFC is not set
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER_PATH=""
-# CONFIG_DEVTMPFS is not set
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
-CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_SYS_HYPERVISOR is not set
-# CONFIG_CONNECTOR is not set
-CONFIG_MTD=y
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_TESTS is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_CMDLINE_PARTS is not set
-# CONFIG_MTD_AR7_PARTS is not set
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_SSFDC is not set
-# CONFIG_SM_FTL is not set
-# CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_SWAP is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=y
-CONFIG_MTD_JEDECPROBE=y
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_CFI_STAA=y
-CONFIG_MTD_CFI_UTIL=y
-# CONFIG_MTD_RAM is not set
-CONFIG_MTD_ROM=y
-CONFIG_MTD_ABSENT=y
-
-#
-# Mapping drivers for chip access
-#
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-CONFIG_MTD_PHYSMAP=y
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-# CONFIG_MTD_INTEL_VR_NOR is not set
-# CONFIG_MTD_PLATRAM is not set
-
-#
-# Self-contained MTD device drivers
-#
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLOCK2MTD is not set
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_NAND_ECC=y
-# CONFIG_MTD_NAND_ECC_SMC is not set
-CONFIG_MTD_NAND=y
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-# CONFIG_MTD_NAND_ECC_BCH is not set
-# CONFIG_MTD_SM_COMMON is not set
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-# CONFIG_MTD_NAND_DENALI is not set
-CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_NAND_RICOH is not set
-# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_CAFE is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
-# CONFIG_MTD_NAND_PLATFORM is not set
-# CONFIG_MTD_ALAUDA is not set
-# CONFIG_MTD_ONENAND is not set
-
-#
-# LPDDR flash memory drivers
-#
-# CONFIG_MTD_LPDDR is not set
-CONFIG_MTD_UBI=y
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_RESERVE=1
-# CONFIG_MTD_UBI_GLUEBI is not set
-# CONFIG_MTD_UBI_DEBUG is not set
-# CONFIG_PARPORT is not set
-CONFIG_BLK_DEV=y
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-
-#
-# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
-#
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_SX8 is not set
-# CONFIG_BLK_DEV_UB is not set
-CONFIG_BLK_DEV_RAM=m
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=4096
-# CONFIG_BLK_DEV_XIP is not set
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_ATA_OVER_ETH is not set
-# CONFIG_BLK_DEV_HD is not set
-# CONFIG_BLK_DEV_RBD is not set
-# CONFIG_SENSORS_LIS3LV02D is not set
-CONFIG_MISC_DEVICES=y
-# CONFIG_AD525X_DPOT is not set
-# CONFIG_PHANTOM is not set
-# CONFIG_INTEL_MID_PTI is not set
-# CONFIG_SGI_IOC4 is not set
-# CONFIG_TIFM_CORE is not set
-# CONFIG_ICS932S401 is not set
-# CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_HP_ILO is not set
-# CONFIG_APDS9802ALS is not set
-# CONFIG_ISL29003 is not set
-# CONFIG_ISL29020 is not set
-# CONFIG_SENSORS_TSL2550 is not set
-# CONFIG_SENSORS_BH1780 is not set
-# CONFIG_SENSORS_BH1770 is not set
-# CONFIG_SENSORS_APDS990X is not set
-# CONFIG_HMC6352 is not set
-# CONFIG_DS1682 is not set
-# CONFIG_BMP085 is not set
-# CONFIG_PCH_PHUB is not set
-# CONFIG_USB_SWITCH_FSA9480 is not set
-# CONFIG_C2PORT is not set
-
-#
-# EEPROM support
-#
-# CONFIG_EEPROM_AT24 is not set
-# CONFIG_EEPROM_LEGACY is not set
-# CONFIG_EEPROM_MAX6875 is not set
-CONFIG_EEPROM_93CX6=y
-# CONFIG_CB710_CORE is not set
-
-#
-# Texas Instruments shared transport line discipline
-#
-# CONFIG_SENSORS_LIS3_I2C is not set
-CONFIG_HAVE_IDE=y
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=y
-# CONFIG_RAID_ATTRS is not set
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-# CONFIG_SCSI_TGT is not set
-# CONFIG_SCSI_NETLINK is not set
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-# CONFIG_CHR_DEV_ST is not set
-# CONFIG_CHR_DEV_OSST is not set
-CONFIG_BLK_DEV_SR=y
-# CONFIG_BLK_DEV_SR_VENDOR is not set
-CONFIG_CHR_DEV_SG=y
-# CONFIG_CHR_DEV_SCH is not set
-# CONFIG_SCSI_MULTI_LUN is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-CONFIG_SCSI_WAIT_SCAN=m
-
-#
-# SCSI Transports
-#
-# CONFIG_SCSI_SPI_ATTRS is not set
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
-# CONFIG_SCSI_SAS_LIBSAS is not set
-# CONFIG_SCSI_SRP_ATTRS is not set
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_ISCSI_TCP is not set
-# CONFIG_ISCSI_BOOT_SYSFS is not set
-# CONFIG_SCSI_CXGB3_ISCSI is not set
-# CONFIG_SCSI_CXGB4_ISCSI is not set
-# CONFIG_SCSI_BNX2_ISCSI is not set
-# CONFIG_SCSI_BNX2X_FCOE is not set
-# CONFIG_BE2ISCSI is not set
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_SCSI_HPSA is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_3W_SAS is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_MVSAS is not set
-# CONFIG_SCSI_DPT_I2O is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_SAS is not set
-# CONFIG_SCSI_MPT2SAS is not set
-# CONFIG_SCSI_HPTIOP is not set
-# CONFIG_LIBFC is not set
-# CONFIG_LIBFCOE is not set
-# CONFIG_FCOE is not set
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_STEX is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-# CONFIG_SCSI_LPFC is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_DC390T is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_PMCRAID is not set
-# CONFIG_SCSI_PM8001 is not set
-# CONFIG_SCSI_SRP is not set
-# CONFIG_SCSI_BFA_FC is not set
-# CONFIG_SCSI_DH is not set
-# CONFIG_SCSI_OSD_INITIATOR is not set
-CONFIG_ATA=y
-# CONFIG_ATA_NONSTANDARD is not set
-CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_SATA_PMP=y
-
-#
-# Controllers with non-SFF native interface
-#
-# CONFIG_SATA_AHCI is not set
-# CONFIG_SATA_AHCI_PLATFORM is not set
-# CONFIG_SATA_INIC162X is not set
-# CONFIG_SATA_ACARD_AHCI is not set
-# CONFIG_SATA_SIL24 is not set
-CONFIG_ATA_SFF=y
-
-#
-# SFF controllers with custom DMA interface
-#
-# CONFIG_PDC_ADMA is not set
-# CONFIG_SATA_QSTOR is not set
-# CONFIG_SATA_SX4 is not set
-CONFIG_ATA_BMDMA=y
-
-#
-# SATA SFF controllers with BMDMA
-#
-# CONFIG_ATA_PIIX is not set
-# CONFIG_SATA_MV is not set
-# CONFIG_SATA_NV is not set
-# CONFIG_SATA_PROMISE is not set
-# CONFIG_SATA_SIL is not set
-# CONFIG_SATA_SIS is not set
-# CONFIG_SATA_SVW is not set
-# CONFIG_SATA_ULI is not set
-# CONFIG_SATA_VIA is not set
-# CONFIG_SATA_VITESSE is not set
-
-#
-# PATA SFF controllers with BMDMA
-#
-# CONFIG_PATA_ALI is not set
-# CONFIG_PATA_AMD is not set
-# CONFIG_PATA_ARTOP is not set
-# CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_ATP867X is not set
-# CONFIG_PATA_CMD64X is not set
-# CONFIG_PATA_CS5520 is not set
-# CONFIG_PATA_CS5530 is not set
-# CONFIG_PATA_CS5536 is not set
-# CONFIG_PATA_CYPRESS is not set
-# CONFIG_PATA_EFAR is not set
-# CONFIG_PATA_HPT366 is not set
-# CONFIG_PATA_HPT37X is not set
-# CONFIG_PATA_HPT3X2N is not set
-# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_IT8213 is not set
-# CONFIG_PATA_IT821X is not set
-# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_MARVELL is not set
-# CONFIG_PATA_NETCELL is not set
-# CONFIG_PATA_NINJA32 is not set
-# CONFIG_PATA_NS87415 is not set
-# CONFIG_PATA_OLDPIIX is not set
-# CONFIG_PATA_OPTIDMA is not set
-# CONFIG_PATA_PDC2027X is not set
-# CONFIG_PATA_PDC_OLD is not set
-# CONFIG_PATA_RADISYS is not set
-# CONFIG_PATA_RDC is not set
-# CONFIG_PATA_SC1200 is not set
-# CONFIG_PATA_SCH is not set
-# CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_SIL680 is not set
-# CONFIG_PATA_SIS is not set
-# CONFIG_PATA_TOSHIBA is not set
-# CONFIG_PATA_TRIFLEX is not set
-# CONFIG_PATA_VIA is not set
-# CONFIG_PATA_WINBOND is not set
-
-#
-# PIO-only SFF controllers
-#
-# CONFIG_PATA_CMD640_PCI is not set
-# CONFIG_PATA_MPIIX is not set
-# CONFIG_PATA_NS87410 is not set
-# CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_PLATFORM is not set
-# CONFIG_PATA_RZ1000 is not set
-
-#
-# Generic fallback / legacy drivers
-#
-# CONFIG_ATA_GENERIC is not set
-# CONFIG_PATA_LEGACY is not set
-# CONFIG_MD is not set
-# CONFIG_TARGET_CORE is not set
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-# CONFIG_FIREWIRE is not set
-# CONFIG_FIREWIRE_NOSY is not set
-# CONFIG_I2O is not set
-CONFIG_NETDEVICES=y
-# CONFIG_DUMMY is not set
-# CONFIG_BONDING is not set
-# CONFIG_MACVLAN is not set
-# CONFIG_EQUALIZER is not set
-CONFIG_TUN=m
-# CONFIG_VETH is not set
-# CONFIG_ARCNET is not set
-CONFIG_MII=y
-# CONFIG_PHYLIB is not set
-CONFIG_NET_ETHERNET=y
-# CONFIG_AX88796 is not set
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_CASSINI is not set
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_SMC91X is not set
-# CONFIG_DM9000 is not set
-# CONFIG_ETHOC is not set
-# CONFIG_SMSC911X is not set
-# CONFIG_DNET is not set
-# CONFIG_NET_TULIP is not set
-# CONFIG_HP100 is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
-# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-# CONFIG_NET_PCI is not set
-# CONFIG_B44 is not set
-# CONFIG_KS8851_MLL is not set
-# CONFIG_ATL2 is not set
-CONFIG_NETDEV_1000=y
-# CONFIG_ACENIC is not set
-# CONFIG_DL2K is not set
-# CONFIG_E1000 is not set
-# CONFIG_E1000E is not set
-# CONFIG_IP1000 is not set
-# CONFIG_IGB is not set
-# CONFIG_IGBVF is not set
-# CONFIG_NS83820 is not set
-# CONFIG_HAMACHI is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_R8169 is not set
-# CONFIG_SIS190 is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2 is not set
-# CONFIG_VIA_VELOCITY is not set
-# CONFIG_TIGON3 is not set
-# CONFIG_BNX2 is not set
-# CONFIG_CNIC is not set
-# CONFIG_QLA3XXX is not set
-# CONFIG_ATL1 is not set
-# CONFIG_ATL1E is not set
-# CONFIG_ATL1C is not set
-# CONFIG_JME is not set
-# CONFIG_STMMAC_ETH is not set
-# CONFIG_PCH_GBE is not set
-# CONFIG_NETDEV_10000 is not set
-# CONFIG_TR is not set
-CONFIG_WLAN=y
-CONFIG_LIBERTAS_THINFIRM=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM_USB=m
-# CONFIG_ATMEL is not set
-CONFIG_AT76C50X_USB=m
-# CONFIG_PRISM54 is not set
-CONFIG_USB_ZD1201=y
-# CONFIG_USB_NET_RNDIS_WLAN is not set
-# CONFIG_RTL8180 is not set
-CONFIG_RTL8187=m
-CONFIG_RTL8187_LEDS=y
-# CONFIG_ADM8211 is not set
-# CONFIG_MAC80211_HWSIM is not set
-# CONFIG_MWL8K is not set
-CONFIG_ATH_COMMON=m
-# CONFIG_ATH_DEBUG is not set
-# CONFIG_ATH5K is not set
-# CONFIG_ATH5K_PCI is not set
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K_COMMON=m
-CONFIG_ATH9K=m
-# CONFIG_ATH9K_PCI is not set
-# CONFIG_ATH9K_AHB is not set
-CONFIG_ATH9K_RATE_CONTROL=y
-CONFIG_ATH9K_HTC=m
-CONFIG_CARL9170=m
-CONFIG_CARL9170_LEDS=y
-CONFIG_CARL9170_WPC=y
-# CONFIG_B43 is not set
-# CONFIG_B43LEGACY is not set
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
-# CONFIG_HOSTAP_PLX is not set
-# CONFIG_HOSTAP_PCI is not set
-# CONFIG_IPW2100 is not set
-# CONFIG_IPW2200 is not set
-# CONFIG_IWLAGN is not set
-# CONFIG_IWL4965 is not set
-# CONFIG_IWL3945 is not set
-CONFIG_LIBERTAS=m
-# CONFIG_LIBERTAS_USB is not set
-# CONFIG_LIBERTAS_DEBUG is not set
-# CONFIG_LIBERTAS_MESH is not set
-# CONFIG_HERMES is not set
-CONFIG_P54_COMMON=m
-# CONFIG_P54_USB is not set
-# CONFIG_P54_PCI is not set
-CONFIG_P54_LEDS=y
-CONFIG_RT2X00=m
-# CONFIG_RT2400PCI is not set
-# CONFIG_RT2500PCI is not set
-# CONFIG_RT61PCI is not set
-# CONFIG_RT2800PCI is not set
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT33XX=y
-CONFIG_RT2800USB_RT35XX=y
-CONFIG_RT2800USB_RT53XX=y
-CONFIG_RT2800USB_UNKNOWN=y
-CONFIG_RT2800_LIB=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_LEDS=y
-# CONFIG_RT2X00_DEBUG is not set
-# CONFIG_RTL8192CE is not set
-# CONFIG_RTL8192SE is not set
-# CONFIG_RTL8192DE is not set
-CONFIG_RTL8192CU=m
-CONFIG_RTLWIFI=m
-CONFIG_RTL8192C_COMMON=m
-CONFIG_WL1251=m
-# CONFIG_WL12XX_MENU is not set
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_MWIFIEX=y
-
-#
-# Enable WiMAX (Networking options) to see the WiMAX drivers
-#
-
-#
-# USB Network Adapters
-#
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_USBNET is not set
-# CONFIG_USB_IPHETH is not set
-# CONFIG_WAN is not set
-
-#
-# CAIF transport drivers
-#
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-CONFIG_PPP=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_MPPE=m
-CONFIG_PPPOE=m
-# CONFIG_SLIP is not set
-CONFIG_SLHC=m
-# CONFIG_NET_FC is not set
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_VMXNET3 is not set
-# CONFIG_ISDN is not set
-# CONFIG_PHONE is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
-CONFIG_INPUT_POLLDEV=m
-# CONFIG_INPUT_SPARSEKMAP is not set
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_INPUT_JOYDEV is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-# CONFIG_KEYBOARD_ADP5588 is not set
-# CONFIG_KEYBOARD_ADP5589 is not set
-# CONFIG_KEYBOARD_ATKBD is not set
-# CONFIG_KEYBOARD_QT1070 is not set
-# CONFIG_KEYBOARD_QT2160 is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_TCA6416 is not set
-# CONFIG_KEYBOARD_LM8323 is not set
-# CONFIG_KEYBOARD_MAX7359 is not set
-# CONFIG_KEYBOARD_MCS is not set
-# CONFIG_KEYBOARD_MPR121 is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_INPUT_MOUSE=y
-# CONFIG_MOUSE_PS2 is not set
-# CONFIG_MOUSE_SERIAL is not set
-# CONFIG_MOUSE_APPLETOUCH is not set
-# CONFIG_MOUSE_BCM5974 is not set
-# CONFIG_MOUSE_VSXXXAA is not set
-# CONFIG_MOUSE_SYNAPTICS_I2C is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
-
-#
-# Hardware I/O ports
-#
-# CONFIG_SERIO is not set
-# CONFIG_GAMEPORT is not set
-
-#
-# Character devices
-#
-# CONFIG_VT is not set
-CONFIG_UNIX98_PTYS=y
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_NOZOMI is not set
-# CONFIG_N_GSM is not set
-# CONFIG_TRACE_SINK is not set
-CONFIG_DEVKMEM=y
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-# CONFIG_SERIAL_8250_EXTENDED is not set
-
-#
-# Non-8250 serial port support
-#
-# CONFIG_SERIAL_MFD_HSU is not set
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-# CONFIG_SERIAL_JSM is not set
-# CONFIG_SERIAL_TIMBERDALE is not set
-# CONFIG_SERIAL_ALTERA_JTAGUART is not set
-# CONFIG_SERIAL_ALTERA_UART is not set
-# CONFIG_SERIAL_PCH_UART is not set
-# CONFIG_SERIAL_XILINX_PS_UART is not set
-# CONFIG_TTY_PRINTK is not set
-# CONFIG_IPMI_HANDLER is not set
-CONFIG_HW_RANDOM=y
-# CONFIG_HW_RANDOM_TIMERIOMEM is not set
-# CONFIG_R3964 is not set
-# CONFIG_APPLICOM is not set
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_TCG_TPM is not set
-CONFIG_DEVPORT=y
-# CONFIG_RAMOOPS is not set
-CONFIG_I2C=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=y
-# CONFIG_I2C_MUX is not set
-CONFIG_I2C_HELPER_AUTO=y
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# PC SMBus host controller drivers
-#
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI1563 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_AMD756 is not set
-# CONFIG_I2C_AMD8111 is not set
-# CONFIG_I2C_I801 is not set
-# CONFIG_I2C_ISCH is not set
-# CONFIG_I2C_PIIX4 is not set
-# CONFIG_I2C_NFORCE2 is not set
-# CONFIG_I2C_SIS5595 is not set
-# CONFIG_I2C_SIS630 is not set
-# CONFIG_I2C_SIS96X is not set
-# CONFIG_I2C_VIA is not set
-# CONFIG_I2C_VIAPRO is not set
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-# CONFIG_I2C_INTEL_MID is not set
-# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PCA_PLATFORM is not set
-# CONFIG_I2C_PXA_PCI is not set
-# CONFIG_I2C_SIMTEC is not set
-# CONFIG_I2C_XILINX is not set
-# CONFIG_I2C_EG20T is not set
-
-#
-# External I2C/SMBus adapter drivers
-#
-# CONFIG_I2C_DIOLAN_U2C is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_TAOS_EVM is not set
-# CONFIG_I2C_TINY_USB is not set
-
-#
-# Other I2C/SMBus bus drivers
-#
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_SPI is not set
-
-#
-# PPS support
-#
-# CONFIG_PPS is not set
-
-#
-# PPS generators support
-#
-
-#
-# PTP clock support
-#
-
-#
-# Enable Device Drivers -> PPS to see the PTP clock options.
-#
-# CONFIG_W1 is not set
-# CONFIG_POWER_SUPPLY is not set
-# CONFIG_HWMON is not set
-# CONFIG_THERMAL is not set
-# CONFIG_WATCHDOG is not set
-CONFIG_SSB_POSSIBLE=y
-
-#
-# Sonics Silicon Backplane
-#
-# CONFIG_SSB is not set
-CONFIG_BCMA_POSSIBLE=y
-
-#
-# Broadcom specific AMBA
-#
-# CONFIG_BCMA is not set
-CONFIG_MFD_SUPPORT=y
-# CONFIG_MFD_CORE is not set
-# CONFIG_MFD_88PM860X is not set
-# CONFIG_MFD_SM501 is not set
-# CONFIG_HTC_PASIC3 is not set
-# CONFIG_TPS6105X is not set
-# CONFIG_TPS6507X is not set
-# CONFIG_TWL4030_CORE is not set
-# CONFIG_MFD_STMPE is not set
-# CONFIG_MFD_TC3589X is not set
-# CONFIG_MFD_TMIO is not set
-# CONFIG_PMIC_DA903X is not set
-# CONFIG_PMIC_ADP5520 is not set
-# CONFIG_MFD_MAX8925 is not set
-# CONFIG_MFD_MAX8997 is not set
-# CONFIG_MFD_MAX8998 is not set
-# CONFIG_MFD_WM8400 is not set
-# CONFIG_MFD_WM831X_I2C is not set
-# CONFIG_MFD_WM8350_I2C is not set
-# CONFIG_MFD_WM8994 is not set
-# CONFIG_MFD_PCF50633 is not set
-# CONFIG_ABX500_CORE is not set
-# CONFIG_LPC_SCH is not set
-# CONFIG_MFD_RDC321X is not set
-# CONFIG_MFD_JANZ_CMODIO is not set
-# CONFIG_MFD_VX855 is not set
-# CONFIG_MFD_WL1273_CORE is not set
-# CONFIG_REGULATOR is not set
-CONFIG_MEDIA_SUPPORT=y
-
-#
-# Multimedia core support
-#
-# CONFIG_MEDIA_CONTROLLER is not set
-CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L2_COMMON=y
-CONFIG_DVB_CORE=y
-CONFIG_DVB_NET=y
-CONFIG_VIDEO_MEDIA=y
-
-#
-# Multimedia drivers
-#
-CONFIG_RC_CORE=y
-CONFIG_LIRC=y
-CONFIG_RC_MAP=y
-CONFIG_IR_NEC_DECODER=y
-CONFIG_IR_RC5_DECODER=y
-CONFIG_IR_RC6_DECODER=y
-CONFIG_IR_JVC_DECODER=y
-CONFIG_IR_SONY_DECODER=y
-CONFIG_IR_RC5_SZ_DECODER=y
-CONFIG_IR_MCE_KBD_DECODER=y
-CONFIG_IR_LIRC_CODEC=y
-# CONFIG_IR_IMON is not set
-# CONFIG_IR_MCEUSB is not set
-# CONFIG_IR_REDRAT3 is not set
-# CONFIG_IR_STREAMZAP is not set
-# CONFIG_RC_LOOPBACK is not set
-CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=y
-CONFIG_MEDIA_TUNER_CUSTOMISE=y
-
-#
-# Customize TV tuners
-#
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_VIDEO_V4L2=y
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-CONFIG_VIDEO_IR_I2C=y
-
-#
-# Encoders, decoders, sensors and other helper chips
-#
-
-#
-# Audio decoders, processors and mixers
-#
-# CONFIG_VIDEO_TVAUDIO is not set
-# CONFIG_VIDEO_TDA7432 is not set
-# CONFIG_VIDEO_TDA9840 is not set
-# CONFIG_VIDEO_TEA6415C is not set
-# CONFIG_VIDEO_TEA6420 is not set
-# CONFIG_VIDEO_MSP3400 is not set
-# CONFIG_VIDEO_CS5345 is not set
-# CONFIG_VIDEO_CS53L32A is not set
-# CONFIG_VIDEO_TLV320AIC23B is not set
-# CONFIG_VIDEO_WM8775 is not set
-# CONFIG_VIDEO_WM8739 is not set
-# CONFIG_VIDEO_VP27SMPX is not set
-
-#
-# RDS decoders
-#
-# CONFIG_VIDEO_SAA6588 is not set
-
-#
-# Video decoders
-#
-# CONFIG_VIDEO_ADV7180 is not set
-# CONFIG_VIDEO_BT819 is not set
-# CONFIG_VIDEO_BT856 is not set
-# CONFIG_VIDEO_BT866 is not set
-# CONFIG_VIDEO_KS0127 is not set
-# CONFIG_VIDEO_SAA7110 is not set
-# CONFIG_VIDEO_SAA711X is not set
-# CONFIG_VIDEO_SAA7191 is not set
-# CONFIG_VIDEO_TVP514X is not set
-# CONFIG_VIDEO_TVP5150 is not set
-# CONFIG_VIDEO_TVP7002 is not set
-# CONFIG_VIDEO_VPX3220 is not set
-
-#
-# Video and audio decoders
-#
-# CONFIG_VIDEO_SAA717X is not set
-# CONFIG_VIDEO_CX25840 is not set
-
-#
-# MPEG video encoders
-#
-# CONFIG_VIDEO_CX2341X is not set
-
-#
-# Video encoders
-#
-# CONFIG_VIDEO_SAA7127 is not set
-# CONFIG_VIDEO_SAA7185 is not set
-# CONFIG_VIDEO_ADV7170 is not set
-# CONFIG_VIDEO_ADV7175 is not set
-# CONFIG_VIDEO_ADV7343 is not set
-# CONFIG_VIDEO_AK881X is not set
-
-#
-# Camera sensor devices
-#
-# CONFIG_VIDEO_OV7670 is not set
-# CONFIG_VIDEO_MT9V011 is not set
-# CONFIG_VIDEO_TCM825X is not set
-
-#
-# Flash devices
-#
-
-#
-# Video improvement chips
-#
-# CONFIG_VIDEO_UPD64031A is not set
-# CONFIG_VIDEO_UPD64083 is not set
-
-#
-# Miscelaneous helper chips
-#
-# CONFIG_VIDEO_THS7303 is not set
-# CONFIG_VIDEO_M52790 is not set
-# CONFIG_VIDEO_BT848 is not set
-# CONFIG_VIDEO_CPIA2 is not set
-# CONFIG_VIDEO_SAA7134 is not set
-# CONFIG_VIDEO_MXB is not set
-# CONFIG_VIDEO_HEXIUM_ORION is not set
-# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_VIDEO_CX88 is not set
-# CONFIG_VIDEO_CX23885 is not set
-# CONFIG_VIDEO_AU0828 is not set
-# CONFIG_VIDEO_IVTV is not set
-# CONFIG_VIDEO_CX18 is not set
-# CONFIG_VIDEO_SAA7164 is not set
-# CONFIG_VIDEO_CAFE_CCIC is not set
-# CONFIG_VIDEO_SR030PC30 is not set
-# CONFIG_VIDEO_NOON010PC30 is not set
-# CONFIG_SOC_CAMERA is not set
-CONFIG_V4L_USB_DRIVERS=y
-# CONFIG_USB_VIDEO_CLASS is not set
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-# CONFIG_USB_M5602 is not set
-# CONFIG_USB_STV06XX is not set
-# CONFIG_USB_GL860 is not set
-# CONFIG_USB_GSPCA_BENQ is not set
-# CONFIG_USB_GSPCA_CONEX is not set
-# CONFIG_USB_GSPCA_CPIA1 is not set
-# CONFIG_USB_GSPCA_ETOMS is not set
-# CONFIG_USB_GSPCA_FINEPIX is not set
-# CONFIG_USB_GSPCA_JEILINJ is not set
-# CONFIG_USB_GSPCA_KINECT is not set
-# CONFIG_USB_GSPCA_KONICA is not set
-# CONFIG_USB_GSPCA_MARS is not set
-# CONFIG_USB_GSPCA_MR97310A is not set
-# CONFIG_USB_GSPCA_NW80X is not set
-# CONFIG_USB_GSPCA_OV519 is not set
-# CONFIG_USB_GSPCA_OV534 is not set
-# CONFIG_USB_GSPCA_OV534_9 is not set
-# CONFIG_USB_GSPCA_PAC207 is not set
-# CONFIG_USB_GSPCA_PAC7302 is not set
-# CONFIG_USB_GSPCA_PAC7311 is not set
-# CONFIG_USB_GSPCA_SE401 is not set
-# CONFIG_USB_GSPCA_SN9C2028 is not set
-# CONFIG_USB_GSPCA_SN9C20X is not set
-# CONFIG_USB_GSPCA_SONIXB is not set
-# CONFIG_USB_GSPCA_SONIXJ is not set
-# CONFIG_USB_GSPCA_SPCA500 is not set
-# CONFIG_USB_GSPCA_SPCA501 is not set
-# CONFIG_USB_GSPCA_SPCA505 is not set
-# CONFIG_USB_GSPCA_SPCA506 is not set
-# CONFIG_USB_GSPCA_SPCA508 is not set
-# CONFIG_USB_GSPCA_SPCA561 is not set
-# CONFIG_USB_GSPCA_SPCA1528 is not set
-# CONFIG_USB_GSPCA_SQ905 is not set
-# CONFIG_USB_GSPCA_SQ905C is not set
-# CONFIG_USB_GSPCA_SQ930X is not set
-# CONFIG_USB_GSPCA_STK014 is not set
-# CONFIG_USB_GSPCA_STV0680 is not set
-# CONFIG_USB_GSPCA_SUNPLUS is not set
-# CONFIG_USB_GSPCA_T613 is not set
-# CONFIG_USB_GSPCA_TV8532 is not set
-# CONFIG_USB_GSPCA_VC032X is not set
-# CONFIG_USB_GSPCA_VICAM is not set
-# CONFIG_USB_GSPCA_XIRLINK_CIT is not set
-# CONFIG_USB_GSPCA_ZC3XX is not set
-# CONFIG_VIDEO_PVRUSB2 is not set
-# CONFIG_VIDEO_HDPVR is not set
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=y
-# CONFIG_VIDEO_TLG2300 is not set
-# CONFIG_VIDEO_CX231XX is not set
-# CONFIG_VIDEO_USBVISION is not set
-# CONFIG_USB_ET61X251 is not set
-# CONFIG_USB_SN9C102 is not set
-# CONFIG_USB_PWC is not set
-# CONFIG_USB_ZR364XX is not set
-# CONFIG_USB_STKWEBCAM is not set
-# CONFIG_USB_S2255 is not set
-# CONFIG_V4L_MEM2MEM_DRIVERS is not set
-CONFIG_RADIO_ADAPTERS=y
-# CONFIG_RADIO_MAXIRADIO is not set
-# CONFIG_I2C_SI4713 is not set
-# CONFIG_RADIO_SI4713 is not set
-# CONFIG_USB_DSBR is not set
-# CONFIG_RADIO_SI470X is not set
-# CONFIG_USB_MR800 is not set
-# CONFIG_RADIO_TEA5764 is not set
-# CONFIG_RADIO_SAA7706H is not set
-# CONFIG_RADIO_TEF6862 is not set
-# CONFIG_RADIO_WL1273 is not set
-
-#
-# Texas Instruments WL128x FM driver (ST based)
-#
-CONFIG_DVB_MAX_ADAPTERS=8
-CONFIG_DVB_DYNAMIC_MINORS=y
-CONFIG_DVB_CAPTURE_DRIVERS=y
-
-#
-# Supported SAA7146 based PCI Adapters
-#
-# CONFIG_TTPCI_EEPROM is not set
-# CONFIG_DVB_AV7110 is not set
-# CONFIG_DVB_BUDGET_CORE is not set
-
-#
-# Supported USB Adapters
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_FRIIO=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_TTUSB_BUDGET=m
-# CONFIG_DVB_TTUSB_DEC is not set
-CONFIG_SMS_SIANO_MDTV=m
-
-#
-# Siano module components
-#
-CONFIG_SMS_USB_DRV=m
-
-#
-# Supported FlexCopII (B2C2) Adapters
-#
-# CONFIG_DVB_B2C2_FLEXCOP is not set
-
-#
-# Supported BT878 Adapters
-#
-
-#
-# Supported Pluto2 Adapters
-#
-# CONFIG_DVB_PLUTO2 is not set
-
-#
-# Supported SDMC DM1105 Adapters
-#
-# CONFIG_DVB_DM1105 is not set
-
-#
-# Supported Earthsoft PT1 Adapters
-#
-# CONFIG_DVB_PT1 is not set
-
-#
-# Supported Mantis Adapters
-#
-# CONFIG_MANTIS_CORE is not set
-
-#
-# Supported nGene Adapters
-#
-# CONFIG_DVB_NGENE is not set
-
-#
-# Supported ddbridge ('Octopus') Adapters
-#
-# CONFIG_DVB_DDBRIDGE is not set
-
-#
-# Supported DVB Frontends
-#
-CONFIG_DVB_FE_CUSTOMISE=y
-
-#
-# Customise DVB Frontends
-#
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV6110x=m
-
-#
-# Multistandard (cable + terrestrial) frontends
-#
-CONFIG_DVB_DRXK=m
-CONFIG_DVB_TDA18271C2DD=m
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_CX24110=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_SI21XX=m
-CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_S5H1432=m
-CONFIG_DVB_DRXD=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-CONFIG_DVB_DIB9000=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_EC100=m
-CONFIG_DVB_STV0367=m
-CONFIG_DVB_CXD2820R=m
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_OR51211=m
-CONFIG_DVB_OR51132=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_S921=m
-CONFIG_DVB_DIB8000=m
-CONFIG_DVB_MB86A20S=m
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_LGS8GL5=m
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_IX2505V=m
-
-#
-# Tools to develop new frontends
-#
-# CONFIG_DVB_DUMMY_FE is not set
-
-#
-# Graphics support
-#
-# CONFIG_VGA_ARB is not set
-# CONFIG_DRM is not set
-# CONFIG_STUB_POULSBO is not set
-# CONFIG_VGASTATE is not set
-# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-CONFIG_FB=y
-# CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB_DDC is not set
-# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-# CONFIG_FB_CFB_FILLRECT is not set
-# CONFIG_FB_CFB_COPYAREA is not set
-# CONFIG_FB_CFB_IMAGEBLIT is not set
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_SYS_FOPS is not set
-# CONFIG_FB_WMT_GE_ROPS is not set
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_BACKLIGHT is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
-
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_UDL is not set
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MB862XX is not set
-# CONFIG_FB_BROADSHEET is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-
-#
-# Display device support
-#
-# CONFIG_DISPLAY_SUPPORT is not set
-# CONFIG_LOGO is not set
-CONFIG_SOUND=y
-CONFIG_SOUND_OSS_CORE=y
-CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SND=y
-CONFIG_SND_TIMER=y
-CONFIG_SND_PCM=y
-CONFIG_SND_SEQUENCER=y
-# CONFIG_SND_SEQ_DUMMY is not set
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=y
-CONFIG_SND_PCM_OSS=y
-# CONFIG_SND_PCM_OSS_PLUGINS is not set
-# CONFIG_SND_SEQUENCER_OSS is not set
-# CONFIG_SND_HRTIMER is not set
-# CONFIG_SND_DYNAMIC_MINORS is not set
-CONFIG_SND_SUPPORT_OLD_API=y
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-# CONFIG_SND_RAWMIDI_SEQ is not set
-# CONFIG_SND_OPL3_LIB_SEQ is not set
-# CONFIG_SND_OPL4_LIB_SEQ is not set
-# CONFIG_SND_SBAWE_SEQ is not set
-# CONFIG_SND_EMU10K1_SEQ is not set
-# CONFIG_SND_DRIVERS is not set
-# CONFIG_SND_PCI is not set
-# CONFIG_SND_MIPS is not set
-# CONFIG_SND_USB is not set
-# CONFIG_SND_SOC is not set
-# CONFIG_SOUND_PRIME is not set
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=y
-CONFIG_HIDRAW=y
-
-#
-# USB Input Devices
-#
-CONFIG_USB_HID=y
-# CONFIG_HID_PID is not set
-CONFIG_USB_HIDDEV=y
-
-#
-# Special HID drivers
-#
-# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_ACRUX is not set
-# CONFIG_HID_APPLE is not set
-# CONFIG_HID_BELKIN is not set
-# CONFIG_HID_CHERRY is not set
-# CONFIG_HID_CHICONY is not set
-# CONFIG_HID_PRODIKEYS is not set
-# CONFIG_HID_CYPRESS is not set
-# CONFIG_HID_DRAGONRISE is not set
-# CONFIG_HID_EMS_FF is not set
-# CONFIG_HID_ELECOM is not set
-# CONFIG_HID_EZKEY is not set
-# CONFIG_HID_HOLTEK is not set
-# CONFIG_HID_KEYTOUCH is not set
-# CONFIG_HID_KYE is not set
-# CONFIG_HID_UCLOGIC is not set
-# CONFIG_HID_WALTOP is not set
-# CONFIG_HID_GYRATION is not set
-# CONFIG_HID_TWINHAN is not set
-# CONFIG_HID_KENSINGTON is not set
-# CONFIG_HID_LCPOWER is not set
-# CONFIG_HID_LOGITECH is not set
-# CONFIG_HID_MAGICMOUSE is not set
-# CONFIG_HID_MICROSOFT is not set
-# CONFIG_HID_MONTEREY is not set
-# CONFIG_HID_MULTITOUCH is not set
-# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_ORTEK is not set
-# CONFIG_HID_PANTHERLORD is not set
-# CONFIG_HID_PETALYNX is not set
-# CONFIG_HID_PICOLCD is not set
-# CONFIG_HID_QUANTA is not set
-# CONFIG_HID_ROCCAT is not set
-# CONFIG_HID_SAMSUNG is not set
-# CONFIG_HID_SONY is not set
-# CONFIG_HID_SPEEDLINK is not set
-# CONFIG_HID_SUNPLUS is not set
-# CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
-# CONFIG_HID_TOPSEED is not set
-# CONFIG_HID_THRUSTMASTER is not set
-CONFIG_HID_WACOM=m
-# CONFIG_HID_WACOM_POWER_SUPPLY is not set
-# CONFIG_HID_WIIMOTE is not set
-# CONFIG_HID_ZEROPLUS is not set
-# CONFIG_HID_ZYDACRON is not set
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB=y
-# CONFIG_USB_DEBUG is not set
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEVICEFS=y
-CONFIG_USB_DEVICE_CLASS=y
-# CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_MON is not set
-# CONFIG_USB_WUSB is not set
-# CONFIG_USB_WUSB_CBAF is not set
-
-#
-# USB Host Controller Drivers
-#
-# CONFIG_USB_C67X00_HCD is not set
-# CONFIG_USB_XHCI_HCD is not set
-# CONFIG_USB_EHCI_HCD is not set
-# CONFIG_USB_OXU210HP_HCD is not set
-# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_ISP1760_HCD is not set
-# CONFIG_USB_ISP1362_HCD is not set
-# CONFIG_USB_OHCI_HCD is not set
-# CONFIG_USB_UHCI_HCD is not set
-# CONFIG_USB_SL811_HCD is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_WHCI_HCD is not set
-# CONFIG_USB_HWA_HCD is not set
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_ACM=m
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_WDM is not set
-# CONFIG_USB_TMC is not set
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=y
-# CONFIG_USB_STORAGE_DEBUG is not set
-# CONFIG_USB_STORAGE_REALTEK is not set
-# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE_USBAT is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
-# CONFIG_USB_STORAGE_ALAUDA is not set
-# CONFIG_USB_STORAGE_ONETOUCH is not set
-# CONFIG_USB_STORAGE_KARMA is not set
-# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
-# CONFIG_USB_STORAGE_ENE_UB6250 is not set
-# CONFIG_USB_UAS is not set
-# CONFIG_USB_LIBUSUAL is not set
-
-#
-# USB Imaging devices
-#
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-
-#
-# USB port drivers
-#
-CONFIG_USB_SERIAL=m
-CONFIG_USB_EZUSB=y
-CONFIG_USB_SERIAL_GENERIC=y
-# CONFIG_USB_SERIAL_AIRCABLE is not set
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-# CONFIG_USB_SERIAL_CH341 is not set
-# CONFIG_USB_SERIAL_WHITEHEAT is not set
-# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
-# CONFIG_USB_SERIAL_CP210X is not set
-# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
-# CONFIG_USB_SERIAL_EMPEG is not set
-CONFIG_USB_SERIAL_FTDI_SIO=m
-# CONFIG_USB_SERIAL_FUNSOFT is not set
-# CONFIG_USB_SERIAL_VISOR is not set
-# CONFIG_USB_SERIAL_IPAQ is not set
-# CONFIG_USB_SERIAL_IR is not set
-# CONFIG_USB_SERIAL_EDGEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
-# CONFIG_USB_SERIAL_GARMIN is not set
-# CONFIG_USB_SERIAL_IPW is not set
-# CONFIG_USB_SERIAL_IUU is not set
-# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
-CONFIG_USB_SERIAL_KEYSPAN=m
-# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA19QW is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA19QI is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
-# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set
-# CONFIG_USB_SERIAL_KLSI is not set
-# CONFIG_USB_SERIAL_KOBIL_SCT is not set
-# CONFIG_USB_SERIAL_MCT_U232 is not set
-# CONFIG_USB_SERIAL_MOS7720 is not set
-# CONFIG_USB_SERIAL_MOS7840 is not set
-# CONFIG_USB_SERIAL_MOTOROLA is not set
-# CONFIG_USB_SERIAL_NAVMAN is not set
-CONFIG_USB_SERIAL_PL2303=m
-# CONFIG_USB_SERIAL_OTI6858 is not set
-# CONFIG_USB_SERIAL_QCAUX is not set
-# CONFIG_USB_SERIAL_QUALCOMM is not set
-# CONFIG_USB_SERIAL_SPCP8X5 is not set
-# CONFIG_USB_SERIAL_HP4X is not set
-# CONFIG_USB_SERIAL_SAFE is not set
-# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
-# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
-# CONFIG_USB_SERIAL_SYMBOL is not set
-# CONFIG_USB_SERIAL_TI is not set
-# CONFIG_USB_SERIAL_CYBERJACK is not set
-# CONFIG_USB_SERIAL_XIRCOM is not set
-CONFIG_USB_SERIAL_WWAN=m
-CONFIG_USB_SERIAL_OPTION=m
-# CONFIG_USB_SERIAL_OMNINET is not set
-# CONFIG_USB_SERIAL_OPTICON is not set
-# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set
-# CONFIG_USB_SERIAL_ZIO is not set
-# CONFIG_USB_SERIAL_SSU100 is not set
-# CONFIG_USB_SERIAL_DEBUG is not set
-
-#
-# USB Miscellaneous drivers
-#
-# CONFIG_USB_EMI62 is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_ADUTUX is not set
-# CONFIG_USB_SEVSEG is not set
-# CONFIG_USB_RIO500 is not set
-# CONFIG_USB_LEGOTOWER is not set
-# CONFIG_USB_LCD is not set
-# CONFIG_USB_LED is not set
-# CONFIG_USB_CYPRESS_CY7C63 is not set
-# CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_IDMOUSE is not set
-# CONFIG_USB_FTDI_ELAN is not set
-# CONFIG_USB_APPLEDISPLAY is not set
-# CONFIG_USB_LD is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_IOWARRIOR is not set
-# CONFIG_USB_TEST is not set
-# CONFIG_USB_ISIGHTFW is not set
-# CONFIG_USB_YUREX is not set
-# CONFIG_USB_GADGET is not set
-
-#
-# OTG and related infrastructure
-#
-# CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_UWB is not set
-# CONFIG_MMC is not set
-# CONFIG_MEMSTICK is not set
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-
-#
-# LED drivers
-#
-# CONFIG_LEDS_LM3530 is not set
-# CONFIG_LEDS_PCA9532 is not set
-# CONFIG_LEDS_LP3944 is not set
-# CONFIG_LEDS_LP5521 is not set
-# CONFIG_LEDS_LP5523 is not set
-# CONFIG_LEDS_PCA955X is not set
-# CONFIG_LEDS_BD2802 is not set
-CONFIG_LEDS_TRIGGERS=y
-
-#
-# LED Triggers
-#
-# CONFIG_LEDS_TRIGGER_TIMER is not set
-# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
-# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
-# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-# CONFIG_ACCESSIBILITY is not set
-# CONFIG_INFINIBAND is not set
-CONFIG_RTC_LIB=y
-# CONFIG_RTC_CLASS is not set
-# CONFIG_DMADEVICES is not set
-# CONFIG_AUXDISPLAY is not set
-# CONFIG_UIO is not set
-
-#
-# Virtio drivers
-#
-# CONFIG_VIRTIO_PCI is not set
-# CONFIG_VIRTIO_BALLOON is not set
-CONFIG_STAGING=y
-# CONFIG_ET131X is not set
-# CONFIG_VIDEO_GO7007 is not set
-# CONFIG_VIDEO_CX25821 is not set
-# CONFIG_VIDEO_TM6000 is not set
-# CONFIG_DVB_CXD2099 is not set
-# CONFIG_USBIP_CORE is not set
-CONFIG_W35UND=m
-CONFIG_PRISM2_USB=m
-# CONFIG_ECHO is not set
-# CONFIG_BRCMUTIL is not set
-# CONFIG_BRCMSMAC is not set
-# CONFIG_ASUS_OLED is not set
-CONFIG_R8187SE=m
-CONFIG_RTL8192U=m
-# CONFIG_RTL8192E is not set
-CONFIG_R8712U=m
-# CONFIG_R8712_AP is not set
-# CONFIG_RTS_PSTOR is not set
-# CONFIG_TRANZPORT is not set
-# CONFIG_POHMELFS is not set
-# CONFIG_IDE_PHISON is not set
-# CONFIG_LINE6_USB is not set
-# CONFIG_USB_SERIAL_QUATECH2 is not set
-# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
-# CONFIG_VT6655 is not set
-# CONFIG_VT6656 is not set
-# CONFIG_VME_BUS is not set
-# CONFIG_DX_SEP is not set
-# CONFIG_IIO is not set
-# CONFIG_XVMALLOC is not set
-# CONFIG_ZRAM is not set
-# CONFIG_FB_SM7XX is not set
-# CONFIG_VIDEO_DT3155 is not set
-# CONFIG_CRYSTALHD is not set
-# CONFIG_FB_XGI is not set
-# CONFIG_LIRC_STAGING is not set
-# CONFIG_EASYCAP is not set
-# CONFIG_SOLO6X10 is not set
-# CONFIG_USB_ENESTORAGE is not set
-# CONFIG_BCM_WIMAX is not set
-# CONFIG_FT1000 is not set
-
-#
-# Speakup console speech
-#
-# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
-# CONFIG_ALTERA_STAPL is not set
-CONFIG_IOMMU_SUPPORT=y
-# CONFIG_VIRT_DRIVERS is not set
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=m
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=y
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_EXT3_FS_XATTR is not set
-CONFIG_EXT4_FS=y
-# CONFIG_EXT4_FS_XATTR is not set
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD=y
-CONFIG_JBD2=y
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_BTRFS_FS is not set
-# CONFIG_NILFS2_FS is not set
-# CONFIG_FS_POSIX_ACL is not set
-CONFIG_EXPORTFS=m
-CONFIG_FILE_LOCKING=y
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY_USER=y
-# CONFIG_FANOTIFY is not set
-# CONFIG_QUOTA is not set
-# CONFIG_QUOTACTL is not set
-CONFIG_AUTOFS4_FS=y
-CONFIG_FUSE_FS=m
-# CONFIG_CUSE is not set
-
-#
-# Caches
-#
-# CONFIG_FSCACHE is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=y
-CONFIG_JOLIET=y
-# CONFIG_ZISOFS is not set
-CONFIG_UDF_FS=y
-CONFIG_UDF_NLS=y
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-CONFIG_NTFS_FS=y
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_RW=y
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-# CONFIG_TMPFS_POSIX_ACL is not set
-# CONFIG_TMPFS_XATTR is not set
-# CONFIG_HUGETLB_PAGE is not set
-# CONFIG_CONFIGFS_FS is not set
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-CONFIG_JFFS2_SUMMARY=y
-# CONFIG_JFFS2_FS_XATTR is not set
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_ZLIB=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_RTIME=y
-CONFIG_JFFS2_RUBIN=y
-# CONFIG_JFFS2_CMODE_NONE is not set
-# CONFIG_JFFS2_CMODE_PRIORITY is not set
-# CONFIG_JFFS2_CMODE_SIZE is not set
-CONFIG_JFFS2_CMODE_FAVOURLZO=y
-CONFIG_UBIFS_FS=y
-# CONFIG_UBIFS_FS_XATTR is not set
-# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-# CONFIG_UBIFS_FS_DEBUG is not set
-# CONFIG_LOGFS is not set
-# CONFIG_CRAMFS is not set
-CONFIG_SQUASHFS=m
-# CONFIG_SQUASHFS_XATTR is not set
-CONFIG_SQUASHFS_ZLIB=y
-# CONFIG_SQUASHFS_LZO is not set
-# CONFIG_SQUASHFS_XZ is not set
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_VXFS_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_MINIX_FS_NATIVE_ENDIAN is not set
-# CONFIG_OMFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_PSTORE is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V3_ACL is not set
-# CONFIG_NFS_V4 is not set
-CONFIG_ROOT_NFS=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V3_ACL is not set
-# CONFIG_NFSD_V4 is not set
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
-# CONFIG_CEPH_FS is not set
-CONFIG_CIFS=y
-# CONFIG_CIFS_STATS is not set
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-# CONFIG_CIFS_XATTR is not set
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_UNIXWARE_DISKLABEL is not set
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_KARMA_PARTITION is not set
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="iso8859-15"
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=y
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_UTF8=y
-
-#
-# Kernel hacking
-#
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
-CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=0
-# CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_STRIP_ASM_SYMS is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DEBUG_SHIRQ is not set
-# CONFIG_LOCKUP_DETECTOR is not set
-# CONFIG_HARDLOCKUP_DETECTOR is not set
-# CONFIG_DETECT_HUNG_TASK is not set
-CONFIG_SCHED_DEBUG=y
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_RT_MUTEX_TESTER is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_SPARSE_RCU_POINTER is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_WRITECOUNT is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_TEST_LIST_SORT is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_BACKTRACE_SELF_TEST is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_SYSCTL_SYSCALL_CHECK is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACING_SUPPORT=y
-# CONFIG_FTRACE is not set
-# CONFIG_DMA_API_DEBUG is not set
-# CONFIG_ATOMIC64_SELFTEST is not set
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-# CONFIG_TEST_KSTRTOX is not set
-CONFIG_EARLY_PRINTK=y
-CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE=""
-# CONFIG_CMDLINE_OVERRIDE is not set
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-# CONFIG_RUNTIME_DEBUG is not set
-
-#
-# Security options
-#
-# CONFIG_KEYS is not set
-# CONFIG_SECURITY_DMESG_RESTRICT is not set
-# CONFIG_SECURITY is not set
-# CONFIG_SECURITYFS is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_PCOMP2=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-# CONFIG_CRYPTO_GF128MUL is not set
-# CONFIG_CRYPTO_NULL is not set
-# CONFIG_CRYPTO_PCRYPT is not set
-CONFIG_CRYPTO_WORKQUEUE=y
-# CONFIG_CRYPTO_CRYPTD is not set
-CONFIG_CRYPTO_AUTHENC=m
-# CONFIG_CRYPTO_TEST is not set
-
-#
-# Authenticated Encryption with Associated Data
-#
-# CONFIG_CRYPTO_CCM is not set
-# CONFIG_CRYPTO_GCM is not set
-# CONFIG_CRYPTO_SEQIV is not set
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=m
-# CONFIG_CRYPTO_CTR is not set
-# CONFIG_CRYPTO_CTS is not set
-CONFIG_CRYPTO_ECB=y
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_PCBC is not set
-# CONFIG_CRYPTO_XTS is not set
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_HMAC=y
-# CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_VMAC is not set
-
-#
-# Digest
-#
-# CONFIG_CRYPTO_CRC32C is not set
-# CONFIG_CRYPTO_GHASH is not set
-CONFIG_CRYPTO_MD4=y
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_MICHAEL_MIC=m
-# CONFIG_CRYPTO_RMD128 is not set
-# CONFIG_CRYPTO_RMD160 is not set
-# CONFIG_CRYPTO_RMD256 is not set
-# CONFIG_CRYPTO_RMD320 is not set
-CONFIG_CRYPTO_SHA1=m
-# CONFIG_CRYPTO_SHA256 is not set
-# CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_WP512 is not set
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_AES=y
-# CONFIG_CRYPTO_ANUBIS is not set
-CONFIG_CRYPTO_ARC4=y
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST6 is not set
-CONFIG_CRYPTO_DES=y
-# CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_SALSA20 is not set
-# CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=y
-# CONFIG_CRYPTO_ZLIB is not set
-CONFIG_CRYPTO_LZO=y
-
-#
-# Random Number Generation
-#
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_USER_API_HASH is not set
-# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_BINARY_PRINTF is not set
-
-#
-# Library routines
-#
-CONFIG_BITREVERSE=y
-CONFIG_CRC_CCITT=y
-CONFIG_CRC16=y
-# CONFIG_CRC_T10DIF is not set
-CONFIG_CRC_ITU_T=y
-CONFIG_CRC32=y
-CONFIG_CRC7=m
-# CONFIG_LIBCRC32C is not set
-# CONFIG_CRC8 is not set
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-# CONFIG_XZ_DEC is not set
-# CONFIG_XZ_DEC_BCJ is not set
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAS_DMA=y
-CONFIG_CPU_RMAP=y
-CONFIG_NLATTR=y
-CONFIG_GENERIC_ATOMIC64=y
-CONFIG_AVERAGE=y
-# CONFIG_CORDIC is not set
index 48fee4f..a82a620 100644 (file)
@@ -600,6 +600,7 @@ CONFIG_MAC80211_LEDS=y
 #
 CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
index 049d83c..1018335 100644 (file)
@@ -1,8 +1,8 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
 
-PR .= "-bsp12"
+PR .= "-bsp13"
 
 SRC_URI += "\
-        file://linux_3.1.1_bm750.patch;patch=1;pnum=1 \
-        file://linux-sata_brcm.patch;patch=1;pnum=1 \
+        file://linux_3.1.1_bm750.patch \
+        file://linux-sata_brcm.patch \
 "
index 4234382..e4653e6 100644 (file)
@@ -7,6 +7,8 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "vuplus-bootlogo"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "vuplus-dvb-modules"
 MACHINE_FEATURES += "kernel26 alsa pci wifi"
 
+MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc"
+
 PREFERRED_PROVIDER_virtual/kernel = "linux-vuplus"
 
 PREFERRED_VERSION_linux-vuplus = "${VUPLUS_KERNEL_VERSION}"
diff --git a/meta-bsp/common/recipes/linux/linux-vuplus-3.1.1/kernel_miscompilation_with_gcc_4_8.patch b/meta-bsp/common/recipes/linux/linux-vuplus-3.1.1/kernel_miscompilation_with_gcc_4_8.patch
new file mode 100644 (file)
index 0000000..013384b
--- /dev/null
@@ -0,0 +1,251 @@
+commit 8511b7b083db01ad0538bea6a8af79f88fe02a8b
+Author: hschang <chang@dev3>
+Date:   Wed Jan 8 20:32:42 2014 +0900
+
+    MIPS: Refactor 'clear_page' and 'copy_page' functions.
+    
+        Remove usage of the '__attribute__((alias("...")))' hack that aliased
+        to integer arrays containing micro-assembled instructions. This hack
+        breaks when building a microMIPS kernel. It also makes the code much
+        easier to understand.
+    
+        [ralf@linux-mips.org: Added back export of the clear_page and copy_page
+        symbols so certain modules will work again.  Also fixed build with
+        CONFIG_SIBYTE_DMA_PAGEOPS enabled.]
+    
+        Signed-off-by: Steven J. Hill <sjhill@mips.com>
+        Cc: linux-mips@linux-mips.org
+        Patchwork: https://patchwork.linux-mips.org/patch/3866/
+        Acked-by: David Daney <david.daney@cavium.com>
+        Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
+
+diff --git a/arch/mips/kernel/mips_ksyms.c b/arch/mips/kernel/mips_ksyms.c
+index 1d04807..17160bf 100644
+--- a/arch/mips/kernel/mips_ksyms.c
++++ b/arch/mips/kernel/mips_ksyms.c
+@@ -5,7 +5,7 @@
+  * License.  See the file "COPYING" in the main directory of this archive
+  * for more details.
+  *
+- * Copyright (C) 1996, 97, 98, 99, 2000, 01, 03, 04, 05 by Ralf Baechle
++ * Copyright (C) 1996, 97, 98, 99, 2000, 01, 03, 04, 05, 12 by Ralf Baechle
+  * Copyright (C) 1999, 2000, 01 Silicon Graphics, Inc.
+  */
+ #include <linux/interrupt.h>
+@@ -35,6 +35,13 @@ EXPORT_SYMBOL(memmove);
+ EXPORT_SYMBOL(kernel_thread);
+ /*
++ * Functions that operate on entire pages.  Mostly used by memory management.
++ */
++
++EXPORT_SYMBOL(clear_page);
++EXPORT_SYMBOL(copy_page);
++
++/*
+  * Userspace access stuff.
+  */
+ EXPORT_SYMBOL(__copy_user);
+diff --git a/arch/mips/mm/Makefile b/arch/mips/mm/Makefile
+index 95e5ccb..2f2dc25 100644
+--- a/arch/mips/mm/Makefile
++++ b/arch/mips/mm/Makefile
+@@ -4,7 +4,7 @@
+ obj-y                         += cache.o dma-default.o extable.o fault.o \
+                                  init.o mmap.o tlbex.o tlbex-fault.o uasm.o \
+-                                 page.o
++                                 page.o page-funcs.o
+ obj-$(CONFIG_32BIT)           += ioremap.o pgtable-32.o
+ obj-$(CONFIG_64BIT)           += pgtable-64.o
+diff --git a/arch/mips/mm/page-funcs.S b/arch/mips/mm/page-funcs.S
+new file mode 100644
+index 0000000..48a6b38
+--- /dev/null
++++ b/arch/mips/mm/page-funcs.S
+@@ -0,0 +1,50 @@
++/*
++ * This file is subject to the terms and conditions of the GNU General Public
++ * License.  See the file "COPYING" in the main directory of this archive
++ * for more details.
++ *
++ * Micro-assembler generated clear_page/copy_page functions.
++ *
++ * Copyright (C) 2012  MIPS Technologies, Inc.
++ * Copyright (C) 2012  Ralf Baechle <ralf@linux-mips.org>
++ */
++#include <asm/asm.h>
++#include <asm/regdef.h>
++
++#ifdef CONFIG_SIBYTE_DMA_PAGEOPS
++#define cpu_clear_page_function_name  clear_page_cpu
++#define cpu_copy_page_function_name   copy_page_cpu
++#else
++#define cpu_clear_page_function_name  clear_page
++#define cpu_copy_page_function_name   copy_page
++#endif
++
++/*
++ * Maximum sizes:
++ *
++ * R4000 128 bytes S-cache:           0x058 bytes
++ * R4600 v1.7:                                0x05c bytes
++ * R4600 v2.0:                                0x060 bytes
++ * With prefetching, 16 word strides  0x120 bytes
++ */
++EXPORT(__clear_page_start)
++LEAF(cpu_clear_page_function_name)
++1:    j       1b              /* Dummy, will be replaced. */
++      .space 288
++END(cpu_clear_page_function_name)
++EXPORT(__clear_page_end)
++
++/*
++ * Maximum sizes:
++ *
++ * R4000 128 bytes S-cache:           0x11c bytes
++ * R4600 v1.7:                                0x080 bytes
++ * R4600 v2.0:                                0x07c bytes
++ * With prefetching, 16 word strides  0x540 bytes
++ */
++EXPORT(__copy_page_start)
++LEAF(cpu_copy_page_function_name)
++1:    j       1b              /* Dummy, will be replaced. */
++      .space 1344
++END(cpu_copy_page_function_name)
++EXPORT(__copy_page_end)
+diff --git a/arch/mips/mm/page.c b/arch/mips/mm/page.c
+index 36272f7..a22bd40 100644
+--- a/arch/mips/mm/page.c
++++ b/arch/mips/mm/page.c
+@@ -6,6 +6,7 @@
+  * Copyright (C) 2003, 04, 05 Ralf Baechle (ralf@linux-mips.org)
+  * Copyright (C) 2007  Maciej W. Rozycki
+  * Copyright (C) 2008  Thiemo Seufer
++ * Copyright (C) 2012  MIPS Technologies, Inc.
+  */
+ #include <linux/init.h>
+ #include <linux/kernel.h>
+@@ -72,45 +73,6 @@ static struct uasm_reloc __cpuinitdata relocs[5];
+ #define cpu_is_r4600_v1_x()   ((read_c0_prid() & 0xfffffff0) == 0x00002010)
+ #define cpu_is_r4600_v2_x()   ((read_c0_prid() & 0xfffffff0) == 0x00002020)
+-/*
+- * Maximum sizes:
+- *
+- * R4000 128 bytes S-cache:           0x058 bytes
+- * R4600 v1.7:                                0x05c bytes
+- * R4600 v2.0:                                0x060 bytes
+- * With prefetching, 16 word strides  0x120 bytes
+- */
+-
+-static u32 clear_page_array[0x120 / 4];
+-
+-#ifdef CONFIG_SIBYTE_DMA_PAGEOPS
+-void clear_page_cpu(void *page) __attribute__((alias("clear_page_array")));
+-#else
+-void clear_page(void *page) __attribute__((alias("clear_page_array")));
+-#endif
+-
+-EXPORT_SYMBOL(clear_page);
+-
+-/*
+- * Maximum sizes:
+- *
+- * R4000 128 bytes S-cache:           0x11c bytes
+- * R4600 v1.7:                                0x080 bytes
+- * R4600 v2.0:                                0x07c bytes
+- * With prefetching, 16 word strides  0x540 bytes
+- */
+-static u32 copy_page_array[0x540 / 4];
+-
+-#ifdef CONFIG_SIBYTE_DMA_PAGEOPS
+-void
+-copy_page_cpu(void *to, void *from) __attribute__((alias("copy_page_array")));
+-#else
+-void copy_page(void *to, void *from) __attribute__((alias("copy_page_array")));
+-#endif
+-
+-EXPORT_SYMBOL(copy_page);
+-
+-
+ static int pref_bias_clear_store __cpuinitdata;
+ static int pref_bias_copy_load __cpuinitdata;
+ static int pref_bias_copy_store __cpuinitdata;
+@@ -283,10 +245,15 @@ static inline void __cpuinit build_clear_pref(u32 **buf, int off)
+               }
+ }
++extern u32 __clear_page_start;
++extern u32 __clear_page_end;
++extern u32 __copy_page_start;
++extern u32 __copy_page_end;
++
+ void __cpuinit build_clear_page(void)
+ {
+       int off;
+-      u32 *buf = (u32 *)&clear_page_array;
++      u32 *buf = &__clear_page_start;
+       struct uasm_label *l = labels;
+       struct uasm_reloc *r = relocs;
+       int i;
+@@ -357,17 +324,17 @@ void __cpuinit build_clear_page(void)
+       uasm_i_jr(&buf, RA);
+       uasm_i_nop(&buf);
+-      BUG_ON(buf > clear_page_array + ARRAY_SIZE(clear_page_array));
++      BUG_ON(buf > &__clear_page_end);
+       uasm_resolve_relocs(relocs, labels);
+       pr_debug("Synthesized clear page handler (%u instructions).\n",
+-               (u32)(buf - clear_page_array));
++               (u32)(buf - &__clear_page_start));
+       pr_debug("\t.set push\n");
+       pr_debug("\t.set noreorder\n");
+-      for (i = 0; i < (buf - clear_page_array); i++)
+-              pr_debug("\t.word 0x%08x\n", clear_page_array[i]);
++      for (i = 0; i < (buf - &__clear_page_start); i++)
++              pr_debug("\t.word 0x%08x\n", (&__clear_page_start)[i]);
+       pr_debug("\t.set pop\n");
+ }
+@@ -428,7 +395,7 @@ static inline void build_copy_store_pref(u32 **buf, int off)
+ void __cpuinit build_copy_page(void)
+ {
+       int off;
+-      u32 *buf = (u32 *)&copy_page_array;
++      u32 *buf = &__copy_page_start;
+       struct uasm_label *l = labels;
+       struct uasm_reloc *r = relocs;
+       int i;
+@@ -596,21 +563,23 @@ void __cpuinit build_copy_page(void)
+       uasm_i_jr(&buf, RA);
+       uasm_i_nop(&buf);
+-      BUG_ON(buf > copy_page_array + ARRAY_SIZE(copy_page_array));
++      BUG_ON(buf > &__copy_page_end);
+       uasm_resolve_relocs(relocs, labels);
+       pr_debug("Synthesized copy page handler (%u instructions).\n",
+-               (u32)(buf - copy_page_array));
++               (u32)(buf - &__copy_page_start));
+       pr_debug("\t.set push\n");
+       pr_debug("\t.set noreorder\n");
+-      for (i = 0; i < (buf - copy_page_array); i++)
+-              pr_debug("\t.word 0x%08x\n", copy_page_array[i]);
++      for (i = 0; i < (buf - &__copy_page_start); i++)
++              pr_debug("\t.word 0x%08x\n", (&__copy_page_start)[i]);
+       pr_debug("\t.set pop\n");
+ }
+ #ifdef CONFIG_SIBYTE_DMA_PAGEOPS
++extern void clear_page_cpu(void *page);
++extern void copy_page_cpu(void *to, void *from);
+ /*
+  * Pad descriptors to cacheline, since each is exclusively owned by a
diff --git a/meta-bsp/common/recipes/linux/linux-vuplus-3.3.8/kernel_miscompilation_with_gcc_4_8.patch b/meta-bsp/common/recipes/linux/linux-vuplus-3.3.8/kernel_miscompilation_with_gcc_4_8.patch
new file mode 100644 (file)
index 0000000..ba69abe
--- /dev/null
@@ -0,0 +1,252 @@
+commit c022630633624a75b3b58f43dd3c6cc896a56cff
+Author: Steven J. Hill <sjhill@mips.com>
+Date:   Fri Jul 6 21:56:01 2012 +0200
+
+    MIPS: Refactor 'clear_page' and 'copy_page' functions.
+    
+    Remove usage of the '__attribute__((alias("...")))' hack that aliased
+    to integer arrays containing micro-assembled instructions. This hack
+    breaks when building a microMIPS kernel. It also makes the code much
+    easier to understand.
+    
+    [ralf@linux-mips.org: Added back export of the clear_page and copy_page
+    symbols so certain modules will work again.  Also fixed build with
+    CONFIG_SIBYTE_DMA_PAGEOPS enabled.]
+    
+    Signed-off-by: Steven J. Hill <sjhill@mips.com>
+    Cc: linux-mips@linux-mips.org
+    Patchwork: https://patchwork.linux-mips.org/patch/3866/
+    Acked-by: David Daney <david.daney@cavium.com>
+    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
+
+diff --git a/arch/mips/kernel/mips_ksyms.c b/arch/mips/kernel/mips_ksyms.c
+index 57ba13e..3fc1691 100644
+--- a/arch/mips/kernel/mips_ksyms.c
++++ b/arch/mips/kernel/mips_ksyms.c
+@@ -5,7 +5,7 @@
+  * License.  See the file "COPYING" in the main directory of this archive
+  * for more details.
+  *
+- * Copyright (C) 1996, 97, 98, 99, 2000, 01, 03, 04, 05 by Ralf Baechle
++ * Copyright (C) 1996, 97, 98, 99, 2000, 01, 03, 04, 05, 12 by Ralf Baechle
+  * Copyright (C) 1999, 2000, 01 Silicon Graphics, Inc.
+  */
+ #include <linux/interrupt.h>
+@@ -35,6 +35,12 @@ EXPORT_SYMBOL(memmove);
+ EXPORT_SYMBOL(kernel_thread);
+ /*
++ * Functions that operate on entire pages.  Mostly used by memory management.
++ */
++EXPORT_SYMBOL(clear_page);
++EXPORT_SYMBOL(copy_page);
++
++/*
+  * Userspace access stuff.
+  */
+ EXPORT_SYMBOL(__copy_user);
+diff --git a/arch/mips/mm/Makefile b/arch/mips/mm/Makefile
+index 4aa2028..fd6203f 100644
+--- a/arch/mips/mm/Makefile
++++ b/arch/mips/mm/Makefile
+@@ -3,8 +3,8 @@
+ #
+ obj-y                         += cache.o dma-default.o extable.o fault.o \
+-                                 gup.o init.o mmap.o page.o tlbex.o \
+-                                 tlbex-fault.o uasm.o
++                                 gup.o init.o mmap.o page.o page-funcs.o \
++                                 tlbex.o tlbex-fault.o uasm.o
+ obj-$(CONFIG_32BIT)           += ioremap.o pgtable-32.o
+ obj-$(CONFIG_64BIT)           += pgtable-64.o
+diff --git a/arch/mips/mm/page-funcs.S b/arch/mips/mm/page-funcs.S
+new file mode 100644
+index 0000000..48a6b38
+--- /dev/null
++++ b/arch/mips/mm/page-funcs.S
+@@ -0,0 +1,50 @@
++/*
++ * This file is subject to the terms and conditions of the GNU General Public
++ * License.  See the file "COPYING" in the main directory of this archive
++ * for more details.
++ *
++ * Micro-assembler generated clear_page/copy_page functions.
++ *
++ * Copyright (C) 2012  MIPS Technologies, Inc.
++ * Copyright (C) 2012  Ralf Baechle <ralf@linux-mips.org>
++ */
++#include <asm/asm.h>
++#include <asm/regdef.h>
++
++#ifdef CONFIG_SIBYTE_DMA_PAGEOPS
++#define cpu_clear_page_function_name  clear_page_cpu
++#define cpu_copy_page_function_name   copy_page_cpu
++#else
++#define cpu_clear_page_function_name  clear_page
++#define cpu_copy_page_function_name   copy_page
++#endif
++
++/*
++ * Maximum sizes:
++ *
++ * R4000 128 bytes S-cache:           0x058 bytes
++ * R4600 v1.7:                                0x05c bytes
++ * R4600 v2.0:                                0x060 bytes
++ * With prefetching, 16 word strides  0x120 bytes
++ */
++EXPORT(__clear_page_start)
++LEAF(cpu_clear_page_function_name)
++1:    j       1b              /* Dummy, will be replaced. */
++      .space 288
++END(cpu_clear_page_function_name)
++EXPORT(__clear_page_end)
++
++/*
++ * Maximum sizes:
++ *
++ * R4000 128 bytes S-cache:           0x11c bytes
++ * R4600 v1.7:                                0x080 bytes
++ * R4600 v2.0:                                0x07c bytes
++ * With prefetching, 16 word strides  0x540 bytes
++ */
++EXPORT(__copy_page_start)
++LEAF(cpu_copy_page_function_name)
++1:    j       1b              /* Dummy, will be replaced. */
++      .space 1344
++END(cpu_copy_page_function_name)
++EXPORT(__copy_page_end)
+diff --git a/arch/mips/mm/page.c b/arch/mips/mm/page.c
+index cc0b626..98f530e 100644
+--- a/arch/mips/mm/page.c
++++ b/arch/mips/mm/page.c
+@@ -6,6 +6,7 @@
+  * Copyright (C) 2003, 04, 05 Ralf Baechle (ralf@linux-mips.org)
+  * Copyright (C) 2007  Maciej W. Rozycki
+  * Copyright (C) 2008  Thiemo Seufer
++ * Copyright (C) 2012  MIPS Technologies, Inc.
+  */
+ #include <linux/init.h>
+ #include <linux/kernel.h>
+@@ -71,45 +72,6 @@ static struct uasm_reloc __cpuinitdata relocs[5];
+ #define cpu_is_r4600_v1_x()   ((read_c0_prid() & 0xfffffff0) == 0x00002010)
+ #define cpu_is_r4600_v2_x()   ((read_c0_prid() & 0xfffffff0) == 0x00002020)
+-/*
+- * Maximum sizes:
+- *
+- * R4000 128 bytes S-cache:           0x058 bytes
+- * R4600 v1.7:                                0x05c bytes
+- * R4600 v2.0:                                0x060 bytes
+- * With prefetching, 16 word strides  0x120 bytes
+- */
+-
+-static u32 clear_page_array[0x120 / 4];
+-
+-#ifdef CONFIG_SIBYTE_DMA_PAGEOPS
+-void clear_page_cpu(void *page) __attribute__((alias("clear_page_array")));
+-#else
+-void clear_page(void *page) __attribute__((alias("clear_page_array")));
+-#endif
+-
+-EXPORT_SYMBOL(clear_page);
+-
+-/*
+- * Maximum sizes:
+- *
+- * R4000 128 bytes S-cache:           0x11c bytes
+- * R4600 v1.7:                                0x080 bytes
+- * R4600 v2.0:                                0x07c bytes
+- * With prefetching, 16 word strides  0x540 bytes
+- */
+-static u32 copy_page_array[0x540 / 4];
+-
+-#ifdef CONFIG_SIBYTE_DMA_PAGEOPS
+-void
+-copy_page_cpu(void *to, void *from) __attribute__((alias("copy_page_array")));
+-#else
+-void copy_page(void *to, void *from) __attribute__((alias("copy_page_array")));
+-#endif
+-
+-EXPORT_SYMBOL(copy_page);
+-
+-
+ static int pref_bias_clear_store __cpuinitdata;
+ static int pref_bias_copy_load __cpuinitdata;
+ static int pref_bias_copy_store __cpuinitdata;
+@@ -282,10 +244,15 @@ static inline void __cpuinit build_clear_pref(u32 **buf, int off)
+               }
+ }
++extern u32 __clear_page_start;
++extern u32 __clear_page_end;
++extern u32 __copy_page_start;
++extern u32 __copy_page_end;
++
+ void __cpuinit build_clear_page(void)
+ {
+       int off;
+-      u32 *buf = (u32 *)&clear_page_array;
++      u32 *buf = &__clear_page_start;
+       struct uasm_label *l = labels;
+       struct uasm_reloc *r = relocs;
+       int i;
+@@ -356,17 +323,17 @@ void __cpuinit build_clear_page(void)
+       uasm_i_jr(&buf, RA);
+       uasm_i_nop(&buf);
+-      BUG_ON(buf > clear_page_array + ARRAY_SIZE(clear_page_array));
++      BUG_ON(buf > &__clear_page_end);
+       uasm_resolve_relocs(relocs, labels);
+       pr_debug("Synthesized clear page handler (%u instructions).\n",
+-               (u32)(buf - clear_page_array));
++               (u32)(buf - &__clear_page_start));
+       pr_debug("\t.set push\n");
+       pr_debug("\t.set noreorder\n");
+-      for (i = 0; i < (buf - clear_page_array); i++)
+-              pr_debug("\t.word 0x%08x\n", clear_page_array[i]);
++      for (i = 0; i < (buf - &__clear_page_start); i++)
++              pr_debug("\t.word 0x%08x\n", (&__clear_page_start)[i]);
+       pr_debug("\t.set pop\n");
+ }
+@@ -427,7 +394,7 @@ static inline void build_copy_store_pref(u32 **buf, int off)
+ void __cpuinit build_copy_page(void)
+ {
+       int off;
+-      u32 *buf = (u32 *)&copy_page_array;
++      u32 *buf = &__copy_page_start;
+       struct uasm_label *l = labels;
+       struct uasm_reloc *r = relocs;
+       int i;
+@@ -595,21 +562,23 @@ void __cpuinit build_copy_page(void)
+       uasm_i_jr(&buf, RA);
+       uasm_i_nop(&buf);
+-      BUG_ON(buf > copy_page_array + ARRAY_SIZE(copy_page_array));
++      BUG_ON(buf > &__copy_page_end);
+       uasm_resolve_relocs(relocs, labels);
+       pr_debug("Synthesized copy page handler (%u instructions).\n",
+-               (u32)(buf - copy_page_array));
++               (u32)(buf - &__copy_page_start));
+       pr_debug("\t.set push\n");
+       pr_debug("\t.set noreorder\n");
+-      for (i = 0; i < (buf - copy_page_array); i++)
+-              pr_debug("\t.word 0x%08x\n", copy_page_array[i]);
++      for (i = 0; i < (buf - &__copy_page_start); i++)
++              pr_debug("\t.word 0x%08x\n", (&__copy_page_start)[i]);
+       pr_debug("\t.set pop\n");
+ }
+ #ifdef CONFIG_SIBYTE_DMA_PAGEOPS
++extern void clear_page_cpu(void *page);
++extern void copy_page_cpu(void *to, void *from);
+ /*
+  * Pad descriptors to cacheline, since each is exclusively owned by a
diff --git a/meta-bsp/common/recipes/linux/linux-vuplus-3.9.6/rt2800usb_fix_warn_tx_status_timeout_to_dbg.patch b/meta-bsp/common/recipes/linux/linux-vuplus-3.9.6/rt2800usb_fix_warn_tx_status_timeout_to_dbg.patch
new file mode 100644 (file)
index 0000000..95d3a23
--- /dev/null
@@ -0,0 +1,13 @@
+diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
+index 098613e..a659677 100644
+--- a/drivers/net/wireless/rt2x00/rt2800usb.c
++++ b/drivers/net/wireless/rt2x00/rt2800usb.c
+@@ -128,7 +128,7 @@ static inline bool rt2800usb_entry_txstatus_timeout(struct queue_entry *entry)
+       tout = time_after(jiffies, entry->last_action + msecs_to_jiffies(100));
+       if (unlikely(tout))
+-              WARNING(entry->queue->rt2x00dev,
++              DEBUG(entry->queue->rt2x00dev,
+                       "TX status timeout for entry %d in queue %d\n",
+                       entry->entry_idx, entry->queue->qid);
+       return tout;
index e816bef..68e059e 100644 (file)
@@ -11,11 +11,11 @@ SRCREV = ""
 MODULE = "linux-2.6.37"
 
 SRC_URI += " http://archive.vuplus.com/download/kernel/stblinux-2.6.37-3.1.tar.bz2 \
-       file://dvb-core.patch;patch=1;pnum=1 \
-       file://fix_cpu_proc.patch;patch=1;pnum=1 \
-       file://brcm_disable_enet1.patch;patch=1;pnum=1 \
-       file://bcmgenet_oobctrl.patch;patch=1;pnum=1 \
-       file://brcm_mtd_mac.patch;patch=1;pnum=1 \
+       file://dvb-core.patch \
+       file://fix_cpu_proc.patch \
+       file://brcm_disable_enet1.patch \
+       file://bcmgenet_oobctrl.patch \
+       file://brcm_mtd_mac.patch \
        file://${MACHINE}_defconfig \
         "
 
index cd98980..853fc55 100644 (file)
@@ -10,10 +10,11 @@ SRCREV = "r2"
 MODULE = "linux-3.1.1"
 
 SRC_URI += "http://archive.vuplus.com/download/kernel/linux-${KV}_${SRCREV}.tar.bz2 \
-       file://fix_cpu_proc.patch;patch=1;pnum=1 \
+        file://fix_cpu_proc.patch \
+        file://igmp.patch \
+        file://rt5372_kernel_3.1.1.patch \
+        file://kernel_miscompilation_with_gcc_4_8.patch \
         file://${MACHINE}_defconfig \
-       file://igmp.patch;patch=1;pnum=1 \
-       file://rt5372_kernel_3.1.1.patch \
 "
 
 SRC_URI[md5sum] = "4dc3ac322453abbfaade7020cddea205"
index 9555656..a6acaf7 100644 (file)
@@ -11,11 +11,11 @@ SRCREV = ""
 MODULE = "linux-3.3.6"
 
 SRC_URI += "http://archive.vuplus.com/download/kernel/stblinux-3.3.6-1.2.tar.bz2 \
-        file://brcm_3.3.patch;patch=1;pnum=1 \
-        file://fix_cpu_proc.patch;patch=1;pnum=1 \
-        file://brcm_mtd_mac.patch;patch=1;pnum=1 \
-        file://dvb_core_5.5.patch;patch=1;pnum=1 \
-       file://brcm_remove_entire_mtd.patch;patch=1;pnum=1 \
+        file://brcm_3.3.patch \
+        file://fix_cpu_proc.patch \
+        file://brcm_mtd_mac.patch \
+        file://dvb_core_5.5.patch \
+       file://brcm_remove_entire_mtd.patch \
         file://${MACHINE}_defconfig \
        "
 
index 1c60f38..14f5462 100644 (file)
@@ -11,15 +11,16 @@ SRCREV = ""
 MODULE = "linux-3.3.8"
 
 SRC_URI += "http://archive.vuplus.com/download/kernel/stblinux-3.3.6-2.0.tar.bz2 \
-        file://brcm_3.3.patch;patch=1;pnum=1 \
-        file://fix_cpu_proc.patch;patch=1;pnum=1 \
-        file://brcm_mtd_mac.patch;patch=1;pnum=1 \
-        file://dvb_core_5.5.patch;patch=1;pnum=1 \
-        file://dvb_backport.patch;patch=1;pnum=1 \
-       file://bmips-no-array-bounds.patch;patch=1;pnum=1 \
+        file://brcm_3.3.patch \
+        file://fix_cpu_proc.patch \
+        file://brcm_mtd_mac.patch \
+        file://dvb_core_5.5.patch \
+        file://dvb_backport.patch \
+       file://bmips-no-array-bounds.patch \
         file://${MACHINE}_defconfig \
        file://rt5372_kernel_3.3.8.patch \
-       "
+       file://kernel_miscompilation_with_gcc_4_8.patch \
+"
 
 S = "${WORKDIR}/linux"
 
index d06d348..2e52dc5 100644 (file)
@@ -5,13 +5,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
 KV = "3.9.6"
 
-PR = "r2"
+PR = "r3"
 SRCREV = ""
 
 MODULE = "linux-3.9.6"
 
 SRC_URI += "http://archive.vuplus.com/download/kernel/stblinux-${KV}.tar.bz2 \
         file://fix_fuse_for_linux_mips_3-9.patch \
+       file://rt2800usb_fix_warn_tx_status_timeout_to_dbg.patch \
         file://${MACHINE}_defconfig \
        "
 
index 669c3c1..bf4b79c 100644 (file)
@@ -2,5 +2,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
 
 PR .= "-bsp9"
 
-SRC_URI += "file://bmips-no-array-bounds.patch;patch=1;pnum=1 "
+SRC_URI += "file://bmips-no-array-bounds.patch "
 
index 16bf74d..181af9d 100644 (file)
@@ -2,7 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
 
 PR .= "-bsp4"
 
-SRC_URI += "file://remove_genet1.patch;patch=1;pnum=1 \
-        file://nand_base.patch;patch=1;pnum=1 \
-       file://brcm_s3_wol.patch;patch=1;pnum=1 \
+SRC_URI += "file://remove_genet1.patch \
+        file://nand_base.patch \
+       file://brcm_s3_wol.patch \
        "
index 6f8a1e8..7575d42 100644 (file)
@@ -591,7 +591,8 @@ CONFIG_MAC80211_LEDS=y
 # Generic Driver Options
 #
 CONFIG_UEVENT_HELPER_PATH=""
-# CONFIG_DEVTMPFS is not set
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
index 7422a02..b193d71 100644 (file)
@@ -1,8 +1,8 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
 
-PR .= "-bsp9"
+PR .= "-bsp10"
 
 SRC_URI += "\
-        file://linux_3.1.1_vusolo.patch;patch=1;pnum=1 \
-        file://fix_cpu_proc_solo.patch;patch=1;pnum=1 \
+        file://linux_3.1.1_vusolo.patch \
+        file://fix_cpu_proc_solo.patch \
 "
index 7bee522..24f52c0 100644 (file)
@@ -1,3 +1,3 @@
 PR .= "-bsp1"
 
-SRC_URI_append = " file://enigma2_vuplus_misc.patch;patch=1;pnum=1"
+SRC_URI_append = " file://enigma2_vuplus_misc.patch"
index 66faca5..596685f 100644 (file)
@@ -2,5 +2,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
 
 PR .= "-bsp10"
 
-SRC_URI += "file://bmips-no-array-bounds.patch;patch=1;pnum=1 "
-SRC_URI += "file://dvb_backport.patch;patch=1;pnum=1 "
+SRC_URI += "file://bmips-no-array-bounds.patch "
+SRC_URI += "file://dvb_backport.patch "
index 74ff50e..0fb748e 100644 (file)
@@ -603,7 +603,8 @@ CONFIG_MAC80211_LEDS=y
 # Generic Driver Options
 #
 CONFIG_UEVENT_HELPER_PATH=""
-# CONFIG_DEVTMPFS is not set
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
index 5b4429c..40a1ef4 100644 (file)
@@ -1,8 +1,8 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
 
-PR .= "-bsp0"
+PR .= "-bsp1"
 
 SRC_URI += "\
-       file://linux-sata_brcm.patch;patch=1;pnum=1 \
+       file://linux-sata_brcm.patch \
        "
 
index ca83ae0..42d96ef 100644 (file)
@@ -603,7 +603,8 @@ CONFIG_MAC80211_LEDS=y
 # Generic Driver Options
 #
 CONFIG_UEVENT_HELPER_PATH=""
-# CONFIG_DEVTMPFS is not set
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
index 6628b1f..3cba553 100644 (file)
@@ -1,8 +1,8 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
 
-PR .= "-bsp11"
+PR .= "-bsp12"
 
 SRC_URI += "\
-        file://linux_3.1.1_vuuno.patch;patch=1;pnum=1 \
-        file://linux-sata_brcm.patch;patch=1;pnum=1 \
+        file://linux_3.1.1_vuuno.patch \
+        file://linux-sata_brcm.patch \
 "
index 835745d..8dbcae9 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 835745de3fc9ad367d82a79983ca22f8694cf7ce
+Subproject commit 8dbcae94bf676794ffd67e8fc77bfe2f627a42f6
diff --git a/meta-openvuplus/classes/autotools.bbclass b/meta-openvuplus/classes/autotools.bbclass
deleted file mode 100644 (file)
index 658ae66..0000000
+++ /dev/null
@@ -1,192 +0,0 @@
-def autotools_dep_prepend(d):
-       if d.getVar('INHIBIT_AUTOTOOLS_DEPS', True):
-               return ''
-
-       pn = d.getVar('PN', True)
-       deps = ''
-
-       if pn in ['autoconf-native', 'automake-native', 'help2man-native']:
-               return deps
-       deps += 'autoconf-native automake-native '
-
-       if not pn in ['libtool', 'libtool-native'] and not pn.endswith("libtool-cross"):
-               deps += 'libtool-native '
-               if not bb.data.inherits_class('native', d) \
-                        and not bb.data.inherits_class('nativesdk', d) \
-                        and not bb.data.inherits_class('cross', d) \
-                        and not d.getVar('INHIBIT_DEFAULT_DEPS', True):
-                    deps += 'libtool-cross '
-
-       return deps + 'gnu-config-native '
-
-EXTRA_OEMAKE = ""
-
-DEPENDS_prepend = "${@autotools_dep_prepend(d)}"
-
-inherit siteinfo
-
-# Space separated list of shell scripts with variables defined to supply test
-# results for autoconf tests we cannot run at build time.
-export CONFIG_SITE = "${@siteinfo_get_files(d)}"
-
-acpaths = "default"
-EXTRA_AUTORECONF = "--exclude=autopoint"
-
-export lt_cv_sys_lib_dlsearch_path_spec = "${libdir} ${base_libdir}"
-
-def autotools_set_crosscompiling(d):
-       if not bb.data.inherits_class('native', d):
-               return " cross_compiling=yes"
-       return ""
-
-def append_libtool_sysroot(d):
-       # Only supply libtool sysroot option for non-native packages
-       if not bb.data.inherits_class('native', d):
-               return '--with-libtool-sysroot=${STAGING_DIR_HOST}'
-       return ""
-
-# EXTRA_OECONF_append = "${@autotools_set_crosscompiling(d)}"
-
-CONFIGUREOPTS = " --build=${BUILD_SYS} \
-                 --host=${HOST_SYS} \
-                 --target=${TARGET_SYS} \
-                 --prefix=${prefix} \
-                 --exec_prefix=${exec_prefix} \
-                 --bindir=${bindir} \
-                 --sbindir=${sbindir} \
-                 --libexecdir=${libexecdir} \
-                 --datadir=${datadir} \
-                 --sysconfdir=${sysconfdir} \
-                 --sharedstatedir=${sharedstatedir} \
-                 --localstatedir=${localstatedir} \
-                 --libdir=${libdir} \
-                 --includedir=${includedir} \
-                 --oldincludedir=${oldincludedir} \
-                 --infodir=${infodir} \
-                 --mandir=${mandir} \
-                 --disable-silent-rules \
-                 ${CONFIGUREOPT_DEPTRACK} \
-                 ${@append_libtool_sysroot(d)}"
-CONFIGUREOPT_DEPTRACK = "--disable-dependency-tracking"
-
-
-oe_runconf () {
-       cfgscript="${S}/configure"
-       if [ -x "$cfgscript" ] ; then
-               bbnote "Running $cfgscript ${CONFIGUREOPTS} ${EXTRA_OECONF} $@"
-               ${CACHED_CONFIGUREVARS} $cfgscript ${CONFIGUREOPTS} ${EXTRA_OECONF} "$@" || bbfatal "oe_runconf failed"
-       else
-               bbfatal "no configure script found at $cfgscript"
-       fi
-}
-
-AUTOTOOLS_AUXDIR ?= "${S}"
-
-autotools_do_configure() {
-       case ${PN} in
-       autoconf*)
-       ;;
-       automake*)
-       ;;
-       *)
-               # WARNING: gross hack follows:
-               # An autotools built package generally needs these scripts, however only
-               # automake or libtoolize actually install the current versions of them.
-               # This is a problem in builds that do not use libtool or automake, in the case
-               # where we -need- the latest version of these scripts.  e.g. running a build
-               # for a package whose autotools are old, on an x86_64 machine, which the old
-               # config.sub does not support.  Work around this by installing them manually
-               # regardless.
-               ( for ac in `find ${S} -name configure.in -o -name configure.ac`; do
-                       rm -f `dirname $ac`/configure
-                       done )
-               if [ -e ${S}/configure.in -o -e ${S}/configure.ac ]; then
-                       olddir=`pwd`
-                       cd ${S}
-                       # Remove any previous copy of the m4 macros
-                       rm -rf ${B}/aclocal-copy/
-                       if [ x"${acpaths}" = xdefault ]; then
-                               acpaths=
-                               for i in `find ${S} -maxdepth 2 -name \*.m4|grep -v 'aclocal.m4'| \
-                                       grep -v 'acinclude.m4' | sed -e 's,\(.*/\).*$,\1,'|sort -u`; do
-                                       acpaths="$acpaths -I $i"
-                               done
-                       else
-                               acpaths="${acpaths}"
-                       fi
-                       AUTOV=`automake --version |head -n 1 |sed "s/.* //;s/\.[0-9]\+$//"`
-                       automake --version
-                       echo "AUTOV is $AUTOV"
-                       if [ -d ${STAGING_DATADIR_NATIVE}/aclocal-$AUTOV ]; then
-                               acpaths="$acpaths -I${STAGING_DATADIR_NATIVE}/aclocal-$AUTOV"
-                       fi
-                       # The aclocal directory could get modified by other processes 
-                       # uninstalling data from the sysroot. See Yocto #861 for details.
-                       # We avoid this by taking a copy here and then files cannot disappear.
-                       if [ -d ${STAGING_DATADIR}/aclocal ]; then
-                               mkdir -p ${B}/aclocal-copy/
-                               # for scratch build this directory can be empty
-                               # so avoid cp's no files to copy error
-                               cp -r ${STAGING_DATADIR}/aclocal/. ${B}/aclocal-copy/
-                               acpaths="$acpaths -I ${B}/aclocal-copy/"
-                       fi
-                       # autoreconf is too shy to overwrite aclocal.m4 if it doesn't look
-                       # like it was auto-generated.  Work around this by blowing it away
-                       # by hand, unless the package specifically asked not to run aclocal.
-                       if ! echo ${EXTRA_AUTORECONF} | grep -q "aclocal"; then
-                               rm -f aclocal.m4
-                       fi
-                       if [ -e configure.in ]; then
-                         CONFIGURE_AC=configure.in
-                       else
-                         CONFIGURE_AC=configure.ac
-                       fi
-                       if ! echo ${EXTRA_OECONF} | grep -q "\-\-disable-nls"; then
-                         if grep "^[[:space:]]*AM_GLIB_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then
-                           if grep "sed.*POTFILES" $CONFIGURE_AC >/dev/null; then
-                             : do nothing -- we still have an old unmodified configure.ac
-                           else
-                             bbnote Executing glib-gettextize --force --copy
-                             echo "no" | glib-gettextize --force --copy
-                           fi
-                         else if grep "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then
-                            # We'd call gettextize here if it wasn't so broken...
-                           cp ${STAGING_DATADIR}/gettext/config.rpath ${AUTOTOOLS_AUXDIR}/
-                           if [ -d ${S}/po/ -a ! -e ${S}/po/Makefile.in.in ]; then
-                             cp ${STAGING_DATADIR}/gettext/po/Makefile.in.in ${S}/po/
-                             if [ ! -e ${S}/po/remove-potcdate.sin ]; then
-                               cp ${STAGING_DATADIR_NATIVE}/gettext/po/remove-potcdate.sin ${S}/po/
-                             fi
-                            fi
-                         fi
-                       fi
-                       fi
-                       mkdir -p m4
-                       if grep "^[[:space:]]*[AI][CT]_PROG_INTLTOOL" $CONFIGURE_AC >/dev/null; then
-                         bbnote Executing intltoolize --copy --force --automake
-                         intltoolize --copy --force --automake
-                       fi
-                       bbnote Executing autoreconf --verbose --install --force ${EXTRA_AUTORECONF} $acpaths
-                       autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || bbfatal "autoreconf execution failed."
-                       cd $olddir
-               fi
-       ;;
-       esac
-       if [ -e ${S}/configure ]; then
-               oe_runconf
-       else
-               bbnote "nothing to configure"
-       fi
-}
-
-autotools_do_install() {
-       oe_runmake 'DESTDIR=${D}' install
-       # Info dir listing isn't interesting at this point so remove it if it exists.
-       if [ -e "${D}${infodir}/dir" ]; then
-               rm -f ${D}${infodir}/dir
-       fi
-}
-
-inherit siteconfig
-
-EXPORT_FUNCTIONS do_configure do_install
index 129303a..457819d 100644 (file)
@@ -2,15 +2,15 @@
 #@NAME: OpenVuplus
 #@DESCRIPTION: Distribution configuration for OpenVuplus
 
-QA_LOG = "1"
+QA_LOGFILE = "${TMPDIR}/qa.log"
 #USER_CLASSES += "image-prelink"
 SANITY_REQUIRED_UTILITIES = "patch diffstat texi2html makeinfo svn bzip2 tar gzip gawk chrpath wget cpio sshpass"
-INHERIT += "buildhistory recipe_sanity testlab"
+INHERIT += "buildhistory recipe_sanity"
 BUILDHISTORY_COMMIT = "1"
 
 DISTRO = "vuplus"
 DISTRO_NAME = "vuplus"
-DISTRO_VERSION = "2.1.0"
+DISTRO_VERSION = "3.0.0"
 DISTRO_PR ?= ""
 
 # meta/conf/distro/include/default-distrovars.inc
@@ -19,7 +19,8 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio"
 
 # extra packages needed if opkg is used
 DISTRO_FEED_PREFIX ?= "official"
-DISTRO_FEED_URI = "http://code.vuplus.com/packages/openvuplus/${DISTRO_VERSION}/vuplus/feeds/stable"
+#DISTRO_FEED_URI = "http://code.vuplus.com/packages/openvuplus/${DISTRO_VERSION}/vuplus/feeds/stable"
+DISTRO_FEED_URI = "http://192.168.102.71/feeds/oe30"
 EXTRAOPKGCONFIG = "distro-feed-configs"
 
 # meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
@@ -32,17 +33,13 @@ IMAGE_FSTYPES =+ "tar.bz2"
 # package versions
 PREFERRED_VERSION_pango ?= "1.28.4"
 
-PREFERRED_VERSION_wpa-supplicant ?= "0.7.3"
-
 PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}"
 PREFERRED_VERSION_linux-libc-headers-nativesdk ?= "${LINUXLIBCVERSION}"
-#PREFERRED_VERSION_linux-libc-headers = "3.1"
-#PREFERRED_VERSION_linux-libc-headers-nativesdk = "3.1"
-#PREFERRED_VERSION_linux-libc-headers = "3.1.1"
-#PREFERRED_VERSION_linux-libc-headers-nativesdk = "3.1.1"
+
+PREFERRED_VERSION_freetype ?= "2.4.12"
 
 # chang : udev_182 is not working with linux-libc-headers_2.6.31.
-PREFERRED_VERSION_udev ?= "124"
+#PREFERRED_VERSION_udev ?= "124"
 
 PREFERRED_PROVIDER_jpeg = "jpeg"
 PREFERRED_PROVIDER_jpeg-native = "jpeg-native"
@@ -53,7 +50,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-inter
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
 
-LICENSE_FLAGS_WHITELIST = "commercial_gst-plugins-ugly commercial_lame commercial_libmad commercial_mpeg2dec"
+LICENSE_FLAGS_WHITELIST = "commercial_gst-plugins-ugly commercial_lame commercial_libmad commercial_mpeg2dec commercial_libav"
 COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse"
 COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse"
 
@@ -90,7 +87,6 @@ PR_append_pn-zlib = "-opt1"
 # Disable installing ldconfig
 USE_LDCONFIG = "0"
 
-TCLIBC = "eglibc"
 TCLIBCAPPEND = ""
 
 # Drop unused PACKAGE_EXTRA_ARCHS
index f8d9bff..9357907 100644 (file)
@@ -50,7 +50,7 @@ SRC_URI[sha256sum] = "e25caa0e9639ea54dd7c4f21e8146ac9859a61fa126f397edf874b5fdc
 
 S = "${WORKDIR}/${BP}"
 
-inherit autotools update-rc.d
+inherit autotools-brokensep update-rc.d
 
 do_configure_prepend () {
         if [ ! -e acinclude.m4 ]; then
diff --git a/meta-openvuplus/recipes-connectivity/bridge-utils/bridge-utils.inc b/meta-openvuplus/recipes-connectivity/bridge-utils/bridge-utils.inc
deleted file mode 100644 (file)
index 75bf2a9..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "Tools for ethernet bridging."
-HOMEPAGE = "http://bridge.sourceforge.net/"
-SECTION = "console/network"
-LICENSE = "GPLv2"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/bridge/bridge-utils-${PV}.tar.gz"
-
-inherit autotools
-
-EXTRA_OECONF = "--with-linux-headers=${STAGING_INCDIR}"
-
-do_install_append () {
-       mv ${D}${sbindir}/brctl ${D}${sbindir}/brctl.${PN}
-       install -d ${D}/${datadir}/bridge-utils
-       install -d ${D}/${sysconfdir}/network/if-pre-up.d
-       install -d ${D}/${sysconfdir}/network/if-post-down.d
-}
-
-DEPENDS = "sysfsutils"
-RRECOMMENDS_${PN} = "kernel-module-bridge"
-
-pkg_postinst_${PN} () {
-       update-alternatives --install ${sbindir}/brctl brctl brctl.${PN} 100
-}
-
-pkg_prerm_${PN} () {
-       update-alternatives --remove brctl brctl.${PN}
-}
diff --git a/meta-openvuplus/recipes-connectivity/bridge-utils/bridge-utils/kernel-headers.patch b/meta-openvuplus/recipes-connectivity/bridge-utils/bridge-utils/kernel-headers.patch
deleted file mode 100644 (file)
index de36f05..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-include missing kernel header
-
-Fixes errors like
-
-| /b/kraj/jlinux-next/poky/build/tmp-eglibc/sysroots/re-64b/usr/include/linux/if_bridge.h:172:20: error: field 'ip6' has incomplete type
-| In file included from ../libbridge/libbridge.h:24:0,
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
-
-Index: bridge-utils-1.5/libbridge/libbridge.h
-===================================================================
---- bridge-utils-1.5.orig/libbridge/libbridge.h        2011-03-28 17:52:54.000000000 -0700
-+++ bridge-utils-1.5/libbridge/libbridge.h     2013-03-04 21:16:25.781188309 -0800
-@@ -20,6 +20,7 @@
- #define _LIBBRIDGE_H
- #include <sys/socket.h>
-+#include <linux/in6.h>
- #include <linux/if.h>
- #include <linux/if_bridge.h>
diff --git a/meta-openvuplus/recipes-connectivity/bridge-utils/bridge-utils_1.5.bb b/meta-openvuplus/recipes-connectivity/bridge-utils/bridge-utils_1.5.bb
deleted file mode 100644 (file)
index 04f863b..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-require bridge-utils.inc
-
-SRC_URI += "file://kernel-headers.patch"
-
-PARALLEL_MAKE = ""
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=f9d20a453221a1b7e32ae84694da2c37"
-
-SRC_URI[md5sum] = "ec7b381160b340648dede58c31bb2238"
-SRC_URI[sha256sum] = "42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688"
-
index 9dd1cae..101d6da 100644 (file)
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
 INITSCRIPT_NAME = "djmount"
 INITSCRIPT_PARAMS = "defaults"
 
-inherit autotools 
+inherit autotools pkgconfig gettext
 
 EXTRA_OECONF = "--with-external-libupnp --with-fuse-prefix='${STAGING_LIBDIR}'"
 
index d69844d..7fab53f 100644 (file)
@@ -13,7 +13,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/curlftpfs/${P}.tar.gz"
 
 S = "${WORKDIR}/${P}"
 
-inherit autotools
+inherit autotools pkgconfig
 
 SRC_URI[md5sum] = "b452123f755114cd4461d56c648d9f12"
 SRC_URI[sha256sum] = "4eb44739c7078ba0edde177bdd266c4cfb7c621075f47f64c85a06b12b3c6958"
diff --git a/meta-openvuplus/recipes-connectivity/hostap/hostap-daemon-0.7.3/defconfig b/meta-openvuplus/recipes-connectivity/hostap/hostap-daemon-0.7.3/defconfig
deleted file mode 100644 (file)
index 1f3c6f4..0000000
+++ /dev/null
@@ -1,145 +0,0 @@
-# Example hostapd build time configuration
-#
-# This file lists the configuration options that are used when building the
-# hostapd binary. All lines starting with # are ignored. Configuration option
-# lines must be commented out complete, if they are not to be included, i.e.,
-# just setting VARIABLE=n is not disabling that variable.
-#
-# This file is included in Makefile, so variables like CFLAGS and LIBS can also
-# be modified from here. In most cass, these lines should use += in order not
-# to override previous values of the variables.
-
-# Driver interface for Host AP driver
-CONFIG_DRIVER_HOSTAP=y
-
-# Driver interface for wired authenticator
-CONFIG_DRIVER_WIRED=y
-
-# Driver interface for madwifi driver
-#CONFIG_DRIVER_MADWIFI=y
-#CFLAGS += -I../../madwifi # change to the madwifi source directory
-
-# Driver interface for Prism54 driver
-CONFIG_DRIVER_PRISM54=y
-
-# Driver interface for drivers using the nl80211 kernel interface
-CONFIG_DRIVER_NL80211=y
-CONFIG_LIBNL20=y
-# driver_nl80211.c requires a rather new libnl (version 1.1) which may not be
-# shipped with your distribution yet. If that is the case, you need to build
-# newer libnl version and point the hostapd build to use it.
-#LIBNL=/usr/src/libnl
-#CFLAGS += -I$(LIBNL)/include
-#LIBS += -L$(LIBNL)/lib
-
-# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
-#CONFIG_DRIVER_BSD=y
-#CFLAGS += -I/usr/local/include
-#LIBS += -L/usr/local/lib
-
-# Driver interface for no driver (e.g., RADIUS server only)
-#CONFIG_DRIVER_NONE=y
-
-# IEEE 802.11F/IAPP
-CONFIG_IAPP=y
-
-# WPA2/IEEE 802.11i RSN pre-authentication
-CONFIG_RSN_PREAUTH=y
-
-# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
-CONFIG_PEERKEY=y
-
-# IEEE 802.11w (management frame protection)
-# This version is an experimental implementation based on IEEE 802.11w/D1.0
-# draft and is subject to change since the standard has not yet been finalized.
-# Driver support is also needed for IEEE 802.11w.
-#CONFIG_IEEE80211W=y
-
-# Integrated EAP server
-CONFIG_EAP=y
-
-# EAP-MD5 for the integrated EAP server
-CONFIG_EAP_MD5=y
-
-# EAP-TLS for the integrated EAP server
-CONFIG_EAP_TLS=y
-
-# EAP-MSCHAPv2 for the integrated EAP server
-CONFIG_EAP_MSCHAPV2=y
-
-# EAP-PEAP for the integrated EAP server
-CONFIG_EAP_PEAP=y
-
-# EAP-GTC for the integrated EAP server
-CONFIG_EAP_GTC=y
-
-# EAP-TTLS for the integrated EAP server
-CONFIG_EAP_TTLS=y
-
-# EAP-SIM for the integrated EAP server
-#CONFIG_EAP_SIM=y
-
-# EAP-AKA for the integrated EAP server
-#CONFIG_EAP_AKA=y
-
-# EAP-AKA' for the integrated EAP server
-# This requires CONFIG_EAP_AKA to be enabled, too.
-#CONFIG_EAP_AKA_PRIME=y
-
-# EAP-PAX for the integrated EAP server
-#CONFIG_EAP_PAX=y
-
-# EAP-PSK for the integrated EAP server (this is _not_ needed for WPA-PSK)
-#CONFIG_EAP_PSK=y
-
-# EAP-SAKE for the integrated EAP server
-#CONFIG_EAP_SAKE=y
-
-# EAP-GPSK for the integrated EAP server
-#CONFIG_EAP_GPSK=y
-# Include support for optional SHA256 cipher suite in EAP-GPSK
-#CONFIG_EAP_GPSK_SHA256=y
-
-# EAP-FAST for the integrated EAP server
-# Note: Default OpenSSL package does not include support for all the
-# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL,
-# the OpenSSL library must be patched (openssl-0.9.9-session-ticket.patch)
-# to add the needed functions.
-#CONFIG_EAP_FAST=y
-
-# Wi-Fi Protected Setup (WPS)
-CONFIG_WPS=y
-# Enable UPnP support for external WPS Registrars
-#CONFIG_WPS_UPNP=y
-
-# EAP-IKEv2
-#CONFIG_EAP_IKEV2=y
-
-# Trusted Network Connect (EAP-TNC)
-#CONFIG_EAP_TNC=y
-
-# PKCS#12 (PFX) support (used to read private key and certificate file from
-# a file that usually has extension .p12 or .pfx)
-CONFIG_PKCS12=y
-
-# RADIUS authentication server. This provides access to the integrated EAP
-# server from external hosts using RADIUS.
-CONFIG_RADIUS_SERVER=y
-
-# Build IPv6 support for RADIUS operations
-CONFIG_IPV6=y
-
-# IEEE Std 802.11r-2008 (Fast BSS Transition)
-#CONFIG_IEEE80211R=y
-
-# Use the hostapd's IEEE 802.11 authentication (ACL), but without
-# the IEEE 802.11 Management capability (e.g., madwifi or FreeBSD/net80211)
-CONFIG_DRIVER_RADIUS_ACL=y
-
-# IEEE 802.11n (High Throughput) support
-CONFIG_IEEE80211N=y
-
-# Remove debugging code that is printing out debug messages to stdout.
-# This can be used to reduce the size of the hostapd considerably if debugging
-# code is not needed.
-#CONFIG_NO_STDOUT_DEBUG=y
diff --git a/meta-openvuplus/recipes-connectivity/hostap/hostap-daemon-0.7.3/init b/meta-openvuplus/recipes-connectivity/hostap/hostap-daemon-0.7.3/init
deleted file mode 100644 (file)
index 79f74b6..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-DAEMON=/usr/sbin/hostapd
-NAME=hostapd
-DESC="HOSTAP Daemon"
-ARGS="/etc/hostapd.conf -B"
-
-test -f $DAEMON || exit 0
-
-set -e
-
-case "$1" in
-    start)
-       echo -n "Starting $DESC: "
-       start-stop-daemon -S -x $DAEMON -- $ARGS
-       echo "$NAME."
-       ;;
-    stop)
-       echo -n "Stopping $DESC: "
-       start-stop-daemon -K -x $DAEMON
-       echo "$NAME."
-       ;;
-    restart)
-       $0 stop
-       $0 start
-       ;;
-    reload)
-       echo -n "Reloading $DESC: "
-       killall -HUP $(basename ${DAEMON})
-       echo "$NAME."
-       ;;
-    *)
-       echo "Usage: $0 {start|stop|restart|reload}"
-       exit 1
-       ;;
-esac
-
-exit 0
diff --git a/meta-openvuplus/recipes-connectivity/hostap/hostap-daemon-0.7.inc b/meta-openvuplus/recipes-connectivity/hostap/hostap-daemon-0.7.inc
deleted file mode 100644 (file)
index 0eb678a..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-HOMEPAGE = "http://hostap.epitest.fi"
-SECTION = "kernel/userland"
-PRIORITY = "optional"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/hostapd-0.7.3/COPYING;md5=c54ce9345727175ff66d17b67ff51f58"
-DEPENDS = "libnl openssl"
-
-inherit update-rc.d
-INITSCRIPT_NAME="hostapd"
-
-do_configure() {
-       install -m 0644 ${WORKDIR}/defconfig ${S}/.config
-}
-
-do_compile() {
-       make
-}
-
-do_install() {
-       install -d ${D}${sbindir} ${D}${sysconfdir}/init.d
-       install -m 0755 ${S}/hostapd ${D}${sbindir}
-       install -m 0755 ${S}/hostapd_cli ${D}${sbindir}
-       install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd
-}
-
diff --git a/meta-openvuplus/recipes-connectivity/hostap/hostap-daemon_0.7.3.bb b/meta-openvuplus/recipes-connectivity/hostap/hostap-daemon_0.7.3.bb
deleted file mode 100644 (file)
index 99297a9..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "User space daemon for extended IEEE 802.11 management"
-
-require hostap-daemon-0.7.inc
-
-PR = "r4"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \
-       file://defconfig \
-       file://init"
-SRC_URI[md5sum] = "91a7c8d0f090b7104152d3455a84c112"
-SRC_URI[sha256sum] = "31eb2781f37e1a4c27969d1594f8019c0ca87779349c099ab812833289961567"
-
-S = "${WORKDIR}/hostapd-${PV}/hostapd"
-
-
diff --git a/meta-openvuplus/recipes-connectivity/hostapd/hostapd_2.%.bbappend b/meta-openvuplus/recipes-connectivity/hostapd/hostapd_2.%.bbappend
new file mode 100644 (file)
index 0000000..b20dda0
--- /dev/null
@@ -0,0 +1,9 @@
+PR .= "-vuplus0"
+
+do_install() {
+    install -d ${D}${sbindir} ${D}${sysconfdir}/init.d
+    install -m 0755 ${S}/hostapd ${D}${sbindir}
+    install -m 0755 ${S}/hostapd_cli ${D}${sbindir}
+    install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd
+}
+
index 49f8d86..0c37c33 100644 (file)
@@ -15,7 +15,11 @@ SRC_URI = "cvs://anonymous@minidlna.cvs.sourceforge.net/cvsroot/minidlna;module=
 
 S = "${WORKDIR}/${PN}"
 
-inherit autotools gettext 
+do_configure_prepend() {
+        sed -i 's/AM_INIT_AUTOMAKE.*$/AM_INIT_AUTOMAKE([foreign subdir-objects])/' ${S}/configure.ac
+}
+
+inherit autotools-brokensep gettext
 
 PACKAGES =+ "${PN}-utils"
 
diff --git a/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/configure-targets.patch b/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/configure-targets.patch
deleted file mode 100644 (file)
index 2317949..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-The number of colons are important :)
-
-Index: openssl-0.9.8g/Configure
-===================================================================
---- openssl-0.9.8g.orig/Configure      2008-04-12 04:27:22.000000000 +0200
-+++ openssl-0.9.8g/Configure   2008-04-12 04:38:56.000000000 +0200
-@@ -395,6 +395,16 @@
- "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${no_asm}",
- "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${no_asm}",
-+ # Linux on ARM
-+"linux-elf-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-elf-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-gnueabi-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-gnueabi-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-uclibceabi-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-uclibceabi-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+
-+"linux-avr32","$ENV{'CC'}:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).",
-+
- #### *BSD [do see comment about ${BSDthreads} above!]
- "BSD-generic32","gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "BSD-x86",    "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
diff --git a/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/ca.patch b/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/ca.patch
deleted file mode 100644 (file)
index aba4d42..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8m/apps/CA.pl.in
-===================================================================
---- openssl-0.9.8m.orig/apps/CA.pl.in  2006-04-28 00:28:51.000000000 +0000
-+++ openssl-0.9.8m/apps/CA.pl.in       2010-02-27 00:36:51.000000000 +0000
-@@ -65,6 +65,7 @@
- foreach (@ARGV) {
-       if ( /^(-\?|-h|-help)$/ ) {
-           print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
-+          print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
-           exit 0;
-       } elsif (/^-newcert$/) {
-           # create a certificate
-@@ -165,6 +166,7 @@
-       } else {
-           print STDERR "Unknown arg $_\n";
-           print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
-+          print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
-           exit 1;
-       }
- }
diff --git a/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/config-hurd.patch b/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/config-hurd.patch
deleted file mode 100644 (file)
index 2359d15..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8k/config
-===================================================================
---- openssl-0.9.8k.orig/config 2009-02-16 09:43:41.000000000 +0100
-+++ openssl-0.9.8k/config      2009-07-19 11:32:41.000000000 +0200
-@@ -162,8 +162,8 @@
-       echo "${MACHINE}-whatever-linux1"; exit 0
-       ;;
--    GNU*)
--      echo "hurd-x86"; exit 0;
-+    GNU:*|GNU/*:*)
-+      echo "${MACHINE}-gnuish"; exit 0;
-       ;;
-     LynxOS:*)
diff --git a/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/debian-targets.patch b/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/debian-targets.patch
deleted file mode 100644 (file)
index 5720988..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8k/Configure
-===================================================================
---- openssl-0.9.8k.orig/Configure      2009-12-09 16:09:41.000000000 +0000
-+++ openssl-0.9.8k/Configure   2009-12-09 16:09:55.000000000 +0000
-@@ -320,6 +320,49 @@
- "osf1-alpha-cc",  "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${no_asm}:dlfcn:alpha-osf1-shared:::.so",
- "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${no_asm}:dlfcn:alpha-osf1-shared::-msym:.so",
-+# Debian GNU/* (various architectures)
-+"debian-alpha","gcc:-DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-alpha-ev4","gcc:-DTERMIO -O3 -Wa,--noexecstack -mcpu=ev4 -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-alpha-ev5","gcc:-DTERMIO -O3 -Wa,--noexecstack -mcpu=ev5 -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-arm","gcc:-DL_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-armeb","gcc:-DB_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-armel","gcc:-DL_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+#"debian-amd64","gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-amd64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm_linux}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-avr32", "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG_BF_PTR::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-kfreebsd-amd64","gcc:-m64 -DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+#"debian-freebsd-alpha","gcc:-DTERMIOS -O -Wa,--noexecstack -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-kfreebsd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-hppa","gcc:-DB_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-hurd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -mtune=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-ia64","gcc:-DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+#"debian-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC",
-+"debian-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-i386-i486","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i486 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-i386-i586","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i586 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-i386-i686/cmov","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i686 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-m68k","gcc:-DB_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-mips",   "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-mipsel",   "gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-netbsd-i386", "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-netbsd-m68k", "gcc:-DB_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-netbsd-sparc",        "gcc:-DB_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -mv8 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-openbsd-alpha","gcc:-DTERMIOS -O3 -Wa,--noexecstack -g::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-openbsd-i386",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-openbsd-mips","gcc:-O2 -Wa,--noexecstack -g -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR:::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-powerpc","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_UNROLL DES_RISC2 DES_PTR MD2_CHAR RC4_INDEX::linux_ppc32.o::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-ppc64","gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::linux_ppc64.o::::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-s390","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 
-+"debian-sh3",   "gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sh4",   "gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sh3eb",   "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sh4eb",   "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-m32r","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sparc","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sparc-v8","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -mcpu=v8 -g -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sparc-v9","gcc:-DB_ENDIAN -DTERMIO -O3 -mcpu=v9 -Wa,--noexecstack -Wa,-Av8plus -g -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sparc64","gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:::des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+
- ####
- #### Variety of LINUX:-)
- ####
diff --git a/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/engines-path.patch b/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/engines-path.patch
deleted file mode 100644 (file)
index 5b4c7d5..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8m/Makefile.org
-===================================================================
---- openssl-0.9.8m.orig/Makefile.org   2010-01-27 16:06:36.000000000 +0000
-+++ openssl-0.9.8m/Makefile.org        2010-02-27 00:43:04.000000000 +0000
-@@ -620,7 +620,7 @@
- install_sw:
-       @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
-               $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
--              $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
-+              $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines \
-               $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \
-               $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
-               $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
-Index: openssl-0.9.8m/engines/Makefile
-===================================================================
---- openssl-0.9.8m.orig/engines/Makefile       2009-11-10 01:53:02.000000000 +0000
-+++ openssl-0.9.8m/engines/Makefile    2010-02-27 00:45:03.000000000 +0000
-@@ -101,13 +101,13 @@
-                               *DSO_DL*)       sfx="sl";;      \
-                               *)              sfx="bad";;     \
-                               esac; \
--                              cp lib$$l.$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new; \
-+                              cp lib$$l.$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/lib$$l.$$sfx.new; \
-                         else \
-                               sfx="so"; \
-                               cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new; \
-                         fi; \
--                        chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new; \
--                        mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx ); \
-+                        chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/lib$$l.$$sfx.new; \
-+                        mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx ); \
-               done; \
-       fi
-Index: openssl-0.9.8m/Configure
-===================================================================
---- openssl-0.9.8m.orig/Configure      2010-02-27 00:40:42.000000000 +0000
-+++ openssl-0.9.8m/Configure   2010-02-27 00:46:47.000000000 +0000
-@@ -1738,7 +1738,7 @@
-               # $foo is to become "$prefix/lib$multilib/engines";
-               # as Makefile.org and engines/Makefile are adapted for
-               # $multilib suffix.
--              my $foo = "$prefix/lib/engines";
-+              my $foo = "$prefix/lib/ssl/engines";
-               $foo =~ s/\\/\\\\/g;
-               print OUT "#define ENGINESDIR \"$foo\"\n";
-               }
diff --git a/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/kfreebsd-pipe.patch b/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/kfreebsd-pipe.patch
deleted file mode 100644 (file)
index b0312f3..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8k/crypto/perlasm/x86_64-xlate.pl
-===================================================================
---- openssl-0.9.8k.orig/crypto/perlasm/x86_64-xlate.pl 2008-02-13 21:01:48.000000000 +0100
-+++ openssl-0.9.8k/crypto/perlasm/x86_64-xlate.pl      2009-07-19 11:37:23.000000000 +0200
-@@ -62,7 +62,7 @@
-   my ($outdev,$outino,@junk)=stat($output);
-     open STDOUT,">$output" || die "can't open $output: $!"
--      if ($stddev!=$outdev || $stdino!=$outino);
-+#     if ($stddev!=$outdev || $stdino!=$outino);
- }
- my $masmref=8 + 50727*2**-32; # 8.00.50727 shipped with VS2005
diff --git a/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/make-targets.patch b/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/make-targets.patch
deleted file mode 100644 (file)
index 91207d8..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8k/Makefile.org
-===================================================================
---- openssl-0.9.8k.orig/Makefile.org   2009-07-19 11:32:41.000000000 +0200
-+++ openssl-0.9.8k/Makefile.org        2009-07-19 11:37:31.000000000 +0200
-@@ -131,7 +131,7 @@
- BASEADDR=
--DIRS=   crypto fips ssl engines apps test tools
-+DIRS=   crypto fips ssl engines apps tools
- SHLIBDIRS= crypto ssl fips
- # dirs in crypto to build
diff --git a/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/man-dir.patch b/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/man-dir.patch
deleted file mode 100644 (file)
index 358f8cd..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8k/Makefile.org
-===================================================================
---- openssl-0.9.8k.orig/Makefile.org   2009-07-19 11:32:41.000000000 +0200
-+++ openssl-0.9.8k/Makefile.org        2009-07-19 11:37:29.000000000 +0200
-@@ -152,7 +152,7 @@
- MAKEFILE= Makefile
--MANDIR=$(OPENSSLDIR)/man
-+MANDIR=/usr/share/man
- MAN1=1
- MAN3=3
- MANSUFFIX=
diff --git a/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/man-section.patch b/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/man-section.patch
deleted file mode 100644 (file)
index b74b12e..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8k/Makefile.org
-===================================================================
---- openssl-0.9.8k.orig/Makefile.org   2009-07-19 11:34:06.000000000 +0200
-+++ openssl-0.9.8k/Makefile.org        2009-07-19 11:37:21.000000000 +0200
-@@ -155,7 +155,8 @@
- MANDIR=/usr/share/man
- MAN1=1
- MAN3=3
--MANSUFFIX=
-+MANSUFFIX=ssl
-+MANSECTION=SSL
- SHELL=/bin/sh
- TOP=    .
-@@ -694,7 +695,7 @@
-               echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
-               (cd `$(PERL) util/dirname.pl $$i`; \
-               sh -c "$$pod2man \
--                      --section=$$sec --center=OpenSSL \
-+                      --section=$${sec}$(MANSECTION) --center=OpenSSL \
-                       --release=$(VERSION) `basename $$i`") \
-                       >  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
-               $(PERL) util/extract-names.pl < $$i | \
-@@ -711,7 +712,7 @@
-               echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
-               (cd `$(PERL) util/dirname.pl $$i`; \
-               sh -c "$$pod2man \
--                      --section=$$sec --center=OpenSSL \
-+                      --section=$${sec}$(MANSECTION) --center=OpenSSL \
-                       --release=$(VERSION) `basename $$i`") \
-                       >  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
-               $(PERL) util/extract-names.pl < $$i | \
diff --git a/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/no-rpath.patch b/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/no-rpath.patch
deleted file mode 100644 (file)
index 53b7614..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8k/Makefile.shared
-===================================================================
---- openssl-0.9.8k.orig/Makefile.shared        2008-09-17 17:56:40.000000000 +0200
-+++ openssl-0.9.8k/Makefile.shared     2009-07-19 11:37:25.000000000 +0200
-@@ -151,7 +151,7 @@
-       NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
-       SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
--DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
-+DO_GNU_APP=LDFLAGS="$(CFLAGS)"
- #This is rather special.  It's a special target with which one can link
- #applications without bothering with any features that have anything to
diff --git a/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/no-symbolic.patch b/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/no-symbolic.patch
deleted file mode 100644 (file)
index 87eadac..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8k/Makefile.shared
-===================================================================
---- openssl-0.9.8k.orig/Makefile.shared        2009-07-19 11:35:02.000000000 +0200
-+++ openssl-0.9.8k/Makefile.shared     2009-07-19 11:35:48.000000000 +0200
-@@ -149,7 +149,7 @@
-       SHLIB_SUFFIX=; \
-       ALLSYMSFLAGS='-Wl,--whole-archive'; \
-       NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
--      SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
-+      SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
- DO_GNU_APP=LDFLAGS="$(CFLAGS)"
diff --git a/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/perl-path.diff b/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/perl-path.diff
deleted file mode 100644 (file)
index ced45a3..0000000
+++ /dev/null
@@ -1,762 +0,0 @@
-Upstream-Status: Backport [debian]
-
-From: Kurt Roeckx <kurt@roeckx.be>
-Subject: Change the perl path's to /usr/bin/perl
-
-This is the result of running:
-perl util/perlpath.pl /usr/bin
-
-The upstream sources have this set to various different paths.
-
---- openssl-0.9.8m.orig/Configure
-+++ openssl-0.9.8m/Configure
-@@ -1,4 +1,4 @@
--:
-+#!/usr/bin/perl
- eval 'exec perl -S $0 ${1+"$@"}'
-     if $running_under_some_shell;
- ##
---- openssl-0.9.8m.orig/VMS/VMSify-conf.pl
-+++ openssl-0.9.8m/VMS/VMSify-conf.pl
-@@ -1,4 +1,4 @@
--#! /usr/bin/perl
-+#!/usr/bin/perl
- use strict;
- use warnings;
---- openssl-0.9.8m.orig/Netware/do_tests.pl
-+++ openssl-0.9.8m/Netware/do_tests.pl
-@@ -1,4 +1,4 @@
--# perl script to run OpenSSL tests
-+#!/usr/bin/perl
- my $base_path      = "\\openssl";
---- openssl-0.9.8m.orig/apps/progs.pl
-+++ openssl-0.9.8m/apps/progs.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- print "/* apps/progs.h */\n";
- print "/* automatically generated by progs.pl for openssl.c */\n\n";
---- openssl-0.9.8m.orig/os2/backwardify.pl
-+++ openssl-0.9.8m/os2/backwardify.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/perl
- use strict;
- # Use as $0
---- openssl-0.9.8m.orig/times/091/mips-rel.pl
-+++ openssl-0.9.8m/times/091/mips-rel.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- &doit(100,"Pentium   100 32",0.0195,0.1000,0.6406,4.6100);    # pentium-100
- &doit(200,"PPro      200 32",0.0070,0.0340,0.2087,1.4700);    # pentium-100
---- openssl-0.9.8m.orig/fips/mkfipsscr.pl
-+++ openssl-0.9.8m/fips/mkfipsscr.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl
- # Quick & dirty utility to generate a script for executing the
- # FIPS 140-2 CMVP algorithm tests based on the pathnames of
- # input algorithm test files actually present (the unqualified
---- openssl-0.9.8m.orig/fips/fipsalgtest.pl
-+++ openssl-0.9.8m/fips/fipsalgtest.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/perl
- # Perl utility to run or verify FIPS 140-2 CMVP algorithm tests based on the
- # pathnames of input algorithm test files actually present (the unqualified
- # file names are consistent but the pathnames are not).
---- openssl-0.9.8m.orig/ms/uplink.pl
-+++ openssl-0.9.8m/ms/uplink.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- #
- # For Microsoft CL this is implemented as inline assembler. So that
- # even though this script can generate even Win32 code, we'll be
---- openssl-0.9.8m.orig/ms/segrenam.pl
-+++ openssl-0.9.8m/ms/segrenam.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- my $quiet = 1;
---- openssl-0.9.8m.orig/ms/cmp.pl
-+++ openssl-0.9.8m/ms/cmp.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- ($#ARGV == 1) || die "usage: cmp.pl <file1> <file2>\n";
---- openssl-0.9.8m.orig/test/cms-test.pl
-+++ openssl-0.9.8m/test/cms-test.pl
-@@ -1,4 +1,4 @@
--# test/cms-test.pl
-+#!/usr/bin/perl
- # Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
- # project.
- #
---- openssl-0.9.8m.orig/test/cms-examples.pl
-+++ openssl-0.9.8m/test/cms-examples.pl
-@@ -1,4 +1,4 @@
--# test/cms-examples.pl
-+#!/usr/bin/perl
- # Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
- # project.
- #
---- openssl-0.9.8m.orig/demos/b64.pl
-+++ openssl-0.9.8m/demos/b64.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Make PEM encoded data have lines of 64 bytes of data
---- openssl-0.9.8m.orig/demos/tunala/configure.in
-+++ openssl-0.9.8m/demos/tunala/configure.in
-@@ -1,4 +1,4 @@
--dnl Process this file with autoconf to produce a configure script.
-+#!/usr/bin/perl
- AC_INIT(tunala.c)
- AM_CONFIG_HEADER(config.h)
- AM_INIT_AUTOMAKE(tunala, 0.0.1-dev)
---- openssl-0.9.8m.orig/crypto/x86cpuid.pl
-+++ openssl-0.9.8m/crypto/x86cpuid.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- push(@INC,"perlasm");
- require "x86asm.pl";
---- openssl-0.9.8m.orig/crypto/x86_64cpuid.pl
-+++ openssl-0.9.8m/crypto/x86_64cpuid.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- $output=shift;
- $masm=1 if ($output =~ /\.asm/);
---- openssl-0.9.8m.orig/crypto/md5/asm/md5-586.pl
-+++ openssl-0.9.8m/crypto/md5/asm/md5-586.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # Normal is the
- # md5_block_x86(MD5_CTX *c, ULONG *X);
---- openssl-0.9.8m.orig/crypto/md5/asm/md5-x86_64.pl
-+++ openssl-0.9.8m/crypto/md5/asm/md5-x86_64.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/perl
- #
- # MD5 optimized for AMD64.
- #
---- openssl-0.9.8m.orig/crypto/sha/asm/sha1-ia64.pl
-+++ openssl-0.9.8m/crypto/sha/asm/sha1-ia64.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- #
- # ====================================================================
- # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
---- openssl-0.9.8m.orig/crypto/sha/asm/sha1-x86_64.pl
-+++ openssl-0.9.8m/crypto/sha/asm/sha1-x86_64.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- #
- # ====================================================================
- # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
---- openssl-0.9.8m.orig/crypto/sha/asm/sha512-sse2.pl
-+++ openssl-0.9.8m/crypto/sha/asm/sha512-sse2.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- #
- # ====================================================================
- # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
---- openssl-0.9.8m.orig/crypto/sha/asm/sha512-ia64.pl
-+++ openssl-0.9.8m/crypto/sha/asm/sha512-ia64.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- #
- # ====================================================================
- # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
---- openssl-0.9.8m.orig/crypto/sha/asm/sha512-x86_64.pl
-+++ openssl-0.9.8m/crypto/sha/asm/sha512-x86_64.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- #
- # ====================================================================
- # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
---- openssl-0.9.8m.orig/crypto/sha/asm/sha1-586.pl
-+++ openssl-0.9.8m/crypto/sha/asm/sha1-586.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- # ====================================================================
- # [Re]written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
---- openssl-0.9.8m.orig/crypto/des/asm/des-586.pl
-+++ openssl-0.9.8m/crypto/des/asm/des-586.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # The inner loop instruction sequence and the IP/FP modifications are from
- # Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk>
---- openssl-0.9.8m.orig/crypto/des/asm/desboth.pl
-+++ openssl-0.9.8m/crypto/des/asm/desboth.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- $L="edi";
- $R="esi";
---- openssl-0.9.8m.orig/crypto/des/asm/des686.pl
-+++ openssl-0.9.8m/crypto/des/asm/des686.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- $prog="des686.pl";
---- openssl-0.9.8m.orig/crypto/des/asm/crypt586.pl
-+++ openssl-0.9.8m/crypto/des/asm/crypt586.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # The inner loop instruction sequence and the IP/FP modifications are from
- # Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk>
---- openssl-0.9.8m.orig/crypto/lhash/num.pl
-+++ openssl-0.9.8m/crypto/lhash/num.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #node     10 ->   4
---- openssl-0.9.8m.orig/crypto/ripemd/asm/rmd-586.pl
-+++ openssl-0.9.8m/crypto/ripemd/asm/rmd-586.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # Normal is the
- # ripemd160_block_asm_data_order(RIPEMD160_CTX *c, ULONG *X,int blocks);
---- openssl-0.9.8m.orig/crypto/rc4/asm/rc4-586.pl
-+++ openssl-0.9.8m/crypto/rc4/asm/rc4-586.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # At some point it became apparent that the original SSLeay RC4
- # assembler implementation performs suboptimaly on latest IA-32
---- openssl-0.9.8m.orig/crypto/rc4/asm/rc4-x86_64.pl
-+++ openssl-0.9.8m/crypto/rc4/asm/rc4-x86_64.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- #
- # ====================================================================
- # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
---- openssl-0.9.8m.orig/crypto/cast/asm/cast-586.pl
-+++ openssl-0.9.8m/crypto/cast/asm/cast-586.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # define for pentium pro friendly version
- $ppro=1;
---- openssl-0.9.8m.orig/crypto/rc5/asm/rc5-586.pl
-+++ openssl-0.9.8m/crypto/rc5/asm/rc5-586.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- push(@INC,"perlasm","../../perlasm");
- require "x86asm.pl";
---- openssl-0.9.8m.orig/crypto/perlasm/x86ms.pl
-+++ openssl-0.9.8m/crypto/perlasm/x86ms.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- package x86ms;
---- openssl-0.9.8m.orig/crypto/perlasm/x86asm.pl
-+++ openssl-0.9.8m/crypto/perlasm/x86asm.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # require 'x86asm.pl';
- # &asm_init("cpp","des-586.pl");
---- openssl-0.9.8m.orig/crypto/perlasm/x86nasm.pl
-+++ openssl-0.9.8m/crypto/perlasm/x86nasm.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- package x86nasm;
---- openssl-0.9.8m.orig/crypto/perlasm/x86unix.pl
-+++ openssl-0.9.8m/crypto/perlasm/x86unix.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- package x86unix;      # GAS actually...
---- openssl-0.9.8m.orig/crypto/perlasm/cbc.pl
-+++ openssl-0.9.8m/crypto/perlasm/cbc.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # void des_ncbc_encrypt(input, output, length, schedule, ivec, enc)
- # des_cblock (*input);
---- openssl-0.9.8m.orig/crypto/perlasm/x86_64-xlate.pl
-+++ openssl-0.9.8m/crypto/perlasm/x86_64-xlate.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- # Ascetic x86_64 AT&T to MASM assembler translator by <appro>.
- #
---- openssl-0.9.8m.orig/crypto/bf/asm/bf-686.pl
-+++ openssl-0.9.8m/crypto/bf/asm/bf-686.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- push(@INC,"perlasm","../../perlasm");
- require "x86asm.pl";
---- openssl-0.9.8m.orig/crypto/bf/asm/bf-586.pl
-+++ openssl-0.9.8m/crypto/bf/asm/bf-586.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- push(@INC,"perlasm","../../perlasm");
- require "x86asm.pl";
---- openssl-0.9.8m.orig/crypto/objects/objects.pl
-+++ openssl-0.9.8m/crypto/objects/objects.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- open (NUMIN,"$ARGV[1]") || die "Can't open number file $ARGV[1]";
- $max_nid=0;
---- openssl-0.9.8m.orig/crypto/objects/obj_dat.pl
-+++ openssl-0.9.8m/crypto/objects/obj_dat.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # fixes bug in floating point emulation on sparc64 when
- # this script produces off-by-one output on sparc64
---- openssl-0.9.8m.orig/crypto/conf/keysets.pl
-+++ openssl-0.9.8m/crypto/conf/keysets.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- $NUMBER=0x01;
- $UPPER=0x02;
---- openssl-0.9.8m.orig/crypto/bn/bn_prime.pl
-+++ openssl-0.9.8m/crypto/bn/bn_prime.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # bn_prime.pl
- $num=2048;
---- openssl-0.9.8m.orig/crypto/bn/asm/x86.pl
-+++ openssl-0.9.8m/crypto/bn/asm/x86.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- push(@INC,"perlasm","../../perlasm");
- require "x86asm.pl";
---- openssl-0.9.8m.orig/crypto/bn/asm/ppc.pl
-+++ openssl-0.9.8m/crypto/bn/asm/ppc.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- #
- # Implemented as a Perl wrapper as we want to support several different
- # architectures with single file. We pick up the target based on the
---- openssl-0.9.8m.orig/crypto/bn/asm/co-586.pl
-+++ openssl-0.9.8m/crypto/bn/asm/co-586.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- push(@INC,"perlasm","../../perlasm");
- require "x86asm.pl";
---- openssl-0.9.8m.orig/crypto/bn/asm/bn-586.pl
-+++ openssl-0.9.8m/crypto/bn/asm/bn-586.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- push(@INC,"perlasm","../../perlasm");
- require "x86asm.pl";
---- openssl-0.9.8m.orig/crypto/bn/asm/mo-586.pl
-+++ openssl-0.9.8m/crypto/bn/asm/mo-586.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- # This is crypto/bn/asm/x86-mont.pl (with asciz from crypto/perlasm/x86asm.pl)
- # from OpenSSL 0.9.9-dev 
---- openssl-0.9.8m.orig/crypto/bn/asm/x86_64-mont.pl
-+++ openssl-0.9.8m/crypto/bn/asm/x86_64-mont.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- # ====================================================================
- # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
---- openssl-0.9.8m.orig/crypto/bn/asm/x86/comba.pl
-+++ openssl-0.9.8m/crypto/bn/asm/x86/comba.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # x86 assember
- sub mul_add_c
---- openssl-0.9.8m.orig/crypto/bn/asm/x86/add.pl
-+++ openssl-0.9.8m/crypto/bn/asm/x86/add.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # x86 assember
- sub bn_add_words
---- openssl-0.9.8m.orig/crypto/bn/asm/x86/mul.pl
-+++ openssl-0.9.8m/crypto/bn/asm/x86/mul.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # x86 assember
- sub bn_mul_words
---- openssl-0.9.8m.orig/crypto/bn/asm/x86/mul_add.pl
-+++ openssl-0.9.8m/crypto/bn/asm/x86/mul_add.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # x86 assember
- sub bn_mul_add_words
---- openssl-0.9.8m.orig/crypto/bn/asm/x86/sqr.pl
-+++ openssl-0.9.8m/crypto/bn/asm/x86/sqr.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # x86 assember
- sub bn_sqr_words
---- openssl-0.9.8m.orig/crypto/bn/asm/x86/sub.pl
-+++ openssl-0.9.8m/crypto/bn/asm/x86/sub.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # x86 assember
- sub bn_sub_words
---- openssl-0.9.8m.orig/crypto/bn/asm/x86/div.pl
-+++ openssl-0.9.8m/crypto/bn/asm/x86/div.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # x86 assember
- sub bn_div_words
---- openssl-0.9.8m.orig/crypto/aes/asm/aes-586.pl
-+++ openssl-0.9.8m/crypto/aes/asm/aes-586.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- #
- # ====================================================================
- # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
---- openssl-0.9.8m.orig/crypto/aes/asm/aes-x86_64.pl
-+++ openssl-0.9.8m/crypto/aes/asm/aes-x86_64.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- #
- # ====================================================================
- # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
---- openssl-0.9.8m.orig/crypto/asn1/charmap.pl
-+++ openssl-0.9.8m/crypto/asn1/charmap.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl
- use strict;
---- openssl-0.9.8m.orig/util/mksdef.pl
-+++ openssl-0.9.8m/util/mksdef.pl
-@@ -1,4 +1,4 @@
--
-+#!/usr/bin/perl
- # Perl script to split libeay32.def into two distinct DEF files for use in
- # fipdso mode. It works out symbols in each case by running "link" command and
- # parsing the output to find the list of missing symbols then splitting
---- openssl-0.9.8m.orig/util/dirname.pl
-+++ openssl-0.9.8m/util/dirname.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- if ($#ARGV < 0) {
-     die "dirname.pl: too few arguments\n";
---- openssl-0.9.8m.orig/util/tab_num.pl
-+++ openssl-0.9.8m/util/tab_num.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- $num=1;
- $width=40;
---- openssl-0.9.8m.orig/util/sp-diff.pl
-+++ openssl-0.9.8m/util/sp-diff.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # This file takes as input, the files that have been output from
- # ssleay speed.
---- openssl-0.9.8m.orig/util/mkerr.pl
-+++ openssl-0.9.8m/util/mkerr.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl
- my $config = "crypto/err/openssl.ec";
- my $debug = 0;
---- openssl-0.9.8m.orig/util/clean-depend.pl
-+++ openssl-0.9.8m/util/clean-depend.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl
- # Clean the dependency list in a makefile of standard includes...
- # Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999
---- openssl-0.9.8m.orig/util/add_cr.pl
-+++ openssl-0.9.8m/util/add_cr.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # This adds a copyright message to a souce code file.
- # It also gets the file name correct.
---- openssl-0.9.8m.orig/util/pod2man.pl
-+++ openssl-0.9.8m/util/pod2man.pl
-@@ -1,4 +1,4 @@
--: #!/usr/bin/perl-5.005
-+#!/usr/bin/perl
-     eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
-       if $running_under_some_shell;
---- openssl-0.9.8m.orig/util/mkstack.pl
-+++ openssl-0.9.8m/util/mkstack.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl
- # This is a utility that searches out "DECLARE_STACK_OF()"
- # declarations in .h and .c files, and updates/creates/replaces
---- openssl-0.9.8m.orig/util/selftest.pl
-+++ openssl-0.9.8m/util/selftest.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl
- #
- # Run the test suite and generate a report
- #
---- openssl-0.9.8m.orig/util/ck_errf.pl
-+++ openssl-0.9.8m/util/ck_errf.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # This is just a quick script to scan for cases where the 'error'
- # function name in a XXXerr() macro is wrong.
---- openssl-0.9.8m.orig/util/mklink.pl
-+++ openssl-0.9.8m/util/mklink.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # mklink.pl
---- openssl-0.9.8m.orig/util/src-dep.pl
-+++ openssl-0.9.8m/util/src-dep.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # we make up an array of
- # $file{function_name}=filename;
---- openssl-0.9.8m.orig/util/deleof.pl
-+++ openssl-0.9.8m/util/deleof.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- while (<>)
-       {
---- openssl-0.9.8m.orig/util/arx.pl
-+++ openssl-0.9.8m/util/arx.pl
-@@ -1,4 +1,4 @@
--#!/bin/perl
-+#!/usr/bin/perl
- # Simple perl script to wrap round "ar" program and exclude any
- # object files in the environment variable EXCL_OBJ
---- openssl-0.9.8m.orig/util/copy.pl
-+++ openssl-0.9.8m/util/copy.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- use Fcntl;
---- openssl-0.9.8m.orig/util/mkdir-p.pl
-+++ openssl-0.9.8m/util/mkdir-p.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # mkdir-p.pl
---- openssl-0.9.8m.orig/util/mkdef.pl
-+++ openssl-0.9.8m/util/mkdef.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl
- #
- # generate a .def file
- #
---- openssl-0.9.8m.orig/util/files.pl
-+++ openssl-0.9.8m/util/files.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # used to generate the file MINFO for use by util/mk1mf.pl
- # It is basically a list of all variables from the passed makefile
---- openssl-0.9.8m.orig/util/mkfiles.pl
-+++ openssl-0.9.8m/util/mkfiles.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # This is a hacked version of files.pl for systems that can't do a 'make files'.
- # Do a perl util/mkminfo.pl >MINFO to build MINFO
---- openssl-0.9.8m.orig/util/perlpath.pl
-+++ openssl-0.9.8m/util/perlpath.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # modify the '#!/usr/local/bin/perl'
- # line in all scripts that rely on perl.
---- openssl-0.9.8m.orig/util/mk1mf.pl
-+++ openssl-0.9.8m/util/mk1mf.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # A bit of an evil hack but it post processes the file ../MINFO which
- # is generated by `make files` in the top directory.
- # This script outputs one mega makefile that has no shell stuff or any
---- openssl-0.9.8m.orig/util/err-ins.pl
-+++ openssl-0.9.8m/util/err-ins.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # tack error codes onto the end of a file
- #
---- openssl-0.9.8m.orig/util/pl/Mingw32.pl
-+++ openssl-0.9.8m/util/pl/Mingw32.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Mingw32.pl -- Mingw
- #
---- openssl-0.9.8m.orig/util/pl/unix.pl
-+++ openssl-0.9.8m/util/pl/unix.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # unix.pl - the standard unix makefile stuff.
- #
---- openssl-0.9.8m.orig/util/pl/netware.pl
-+++ openssl-0.9.8m/util/pl/netware.pl
-@@ -1,4 +1,4 @@
--# Metrowerks Codewarrior or gcc / nlmconv for NetWare
-+#!/usr/bin/perl
- #
- $version_header = "crypto/opensslv.h";
---- openssl-0.9.8m.orig/util/pl/VC-32.pl
-+++ openssl-0.9.8m/util/pl/VC-32.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # VC-32.pl - unified script for Microsoft Visual C++, covering Win32,
- # Win64 and WinCE [follow $FLAVOR variable to trace the differences].
- #
---- openssl-0.9.8m.orig/util/pl/OS2-EMX.pl
-+++ openssl-0.9.8m/util/pl/OS2-EMX.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # OS2-EMX.pl - for EMX GCC on OS/2
- #
---- openssl-0.9.8m.orig/util/pl/ultrix.pl
-+++ openssl-0.9.8m/util/pl/ultrix.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # linux.pl - the standard unix makefile stuff.
- #
---- openssl-0.9.8m.orig/util/pl/linux.pl
-+++ openssl-0.9.8m/util/pl/linux.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # linux.pl - the standard unix makefile stuff.
- #
---- openssl-0.9.8m.orig/util/pl/BC-32.pl
-+++ openssl-0.9.8m/util/pl/BC-32.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # Borland C++ builder 3 and 4 -- Janez Jere <jj@void.si>
- #
diff --git a/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/pic.patch b/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/pic.patch
deleted file mode 100644 (file)
index 5fc8f65..0000000
+++ /dev/null
@@ -1,303 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8o/crypto/Makefile
-===================================================================
---- openssl-0.9.8o.orig/crypto/Makefile        2008-09-17 17:10:55.000000000 +0000
-+++ openssl-0.9.8o/crypto/Makefile     2010-06-06 13:09:28.000000000 +0000
-@@ -57,7 +57,7 @@
-       echo "  #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \
-       echo '#endif' ) >buildinf.h
--x86cpuid-elf.s:       x86cpuid.pl perlasm/x86asm.pl
-+x86cpuid-elf.S:       x86cpuid.pl perlasm/x86asm.pl
-       $(PERL) x86cpuid.pl elf $(CFLAGS) $(PROCESSOR) > $@
- x86cpuid-cof.s: x86cpuid.pl perlasm/x86asm.pl
-       $(PERL) x86cpuid.pl coff $(CFLAGS) $(PROCESSOR) > $@
-@@ -70,7 +70,7 @@
- uplink-cof.s: ../ms/uplink.pl
-       $(PERL) ../ms/uplink.pl coff > $@
--x86_64cpuid.s: x86_64cpuid.pl
-+x86_64cpuid.S: x86_64cpuid.pl
-       $(PERL) x86_64cpuid.pl $@
- ia64cpuid.s: ia64cpuid.S
-       $(CC) $(CFLAGS) -E ia64cpuid.S > $@
-Index: openssl-0.9.8o/crypto/x86_64cpuid.pl
-===================================================================
---- openssl-0.9.8o.orig/crypto/x86_64cpuid.pl  2007-11-11 16:25:00.000000000 +0000
-+++ openssl-0.9.8o/crypto/x86_64cpuid.pl       2010-06-06 13:09:28.000000000 +0000
-@@ -95,7 +95,11 @@
- .size OPENSSL_wipe_cpu,.-OPENSSL_wipe_cpu
- .section      .init
-+#ifdef OPENSSL_PIC
-+      call    OPENSSL_cpuid_setup\@PLT
-+#else
-       call    OPENSSL_cpuid_setup
-+#endif
- ___
-Index: openssl-0.9.8o/crypto/md5/Makefile
-===================================================================
---- openssl-0.9.8o.orig/crypto/md5/Makefile    2008-09-17 17:11:02.000000000 +0000
-+++ openssl-0.9.8o/crypto/md5/Makefile 2010-06-06 13:09:28.000000000 +0000
-@@ -52,7 +52,8 @@
- mx86-out.s: asm/md5-586.pl ../perlasm/x86asm.pl
-       (cd asm; $(PERL) md5-586.pl a.out $(CFLAGS) > ../$@)
--md5-x86_64.s: asm/md5-x86_64.pl;      $(PERL) asm/md5-x86_64.pl $@
-+md5-x86_64.s: asm/md5-x86_64.pl
-+      $(PERL) asm/md5-x86_64.pl $@
- files:
-       $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-Index: openssl-0.9.8o/crypto/des/asm/desboth.pl
-===================================================================
---- openssl-0.9.8o.orig/crypto/des/asm/desboth.pl      2001-10-24 21:20:56.000000000 +0000
-+++ openssl-0.9.8o/crypto/des/asm/desboth.pl   2010-06-06 13:09:28.000000000 +0000
-@@ -16,6 +16,11 @@
-       &push("edi");
-+      &call   (&label("pic_point0"));
-+      &set_label("pic_point0");
-+      &blindpop("ebp");
-+      &add    ("ebp", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point0") . "]");
-+
-       &comment("");
-       &comment("Load the data words");
-       &mov($L,&DWP(0,"ebx","",0));
-@@ -47,15 +52,21 @@
-       &mov(&swtmp(2), (DWC(($enc)?"1":"0")));
-       &mov(&swtmp(1), "eax");
-       &mov(&swtmp(0), "ebx");
--      &call("DES_encrypt2");
-+      &exch("ebx", "ebp");
-+      &call("DES_encrypt2\@PLT");
-+      &exch("ebx", "ebp");
-       &mov(&swtmp(2), (DWC(($enc)?"0":"1")));
-       &mov(&swtmp(1), "edi");
-       &mov(&swtmp(0), "ebx");
--      &call("DES_encrypt2");
-+      &exch("ebx", "ebp");
-+      &call("DES_encrypt2\@PLT");
-+      &exch("ebx", "ebp");
-       &mov(&swtmp(2), (DWC(($enc)?"1":"0")));
-       &mov(&swtmp(1), "esi");
-       &mov(&swtmp(0), "ebx");
--      &call("DES_encrypt2");
-+      &exch("ebx", "ebp");
-+      &call("DES_encrypt2\@PLT");
-+      &exch("ebx", "ebp");
-       &stack_pop(3);
-       &mov($L,&DWP(0,"ebx","",0));
-Index: openssl-0.9.8o/crypto/rc4/Makefile
-===================================================================
---- openssl-0.9.8o.orig/crypto/rc4/Makefile    2008-11-19 16:03:50.000000000 +0000
-+++ openssl-0.9.8o/crypto/rc4/Makefile 2010-06-06 13:09:28.000000000 +0000
-@@ -51,7 +51,7 @@
- rx86-out.s: asm/rc4-586.pl ../perlasm/x86asm.pl
-       (cd asm; $(PERL) rc4-586.pl a.out $(CFLAGS) > ../$@)
--rc4-x86_64.s: asm/rc4-x86_64.pl;      $(PERL) asm/rc4-x86_64.pl $@
-+rc4-x86_64.S: asm/rc4-x86_64.pl;      $(PERL) asm/rc4-x86_64.pl $@
- rc4-ia64.s: asm/rc4-ia64.S
-       @case `awk '/^#define RC4_INT/{print$$NF}' $(TOP)/include/openssl/opensslconf.h` in \
-Index: openssl-0.9.8o/crypto/rc4/asm/rc4-x86_64.pl
-===================================================================
---- openssl-0.9.8o.orig/crypto/rc4/asm/rc4-x86_64.pl   2008-09-16 10:47:27.000000000 +0000
-+++ openssl-0.9.8o/crypto/rc4/asm/rc4-x86_64.pl        2010-06-06 13:09:28.000000000 +0000
-@@ -270,7 +270,11 @@
-       xor     %r10,%r10
-       xor     %r11,%r11
-+#ifdef OPENSSL_PIC
-+      mov     OPENSSL_ia32cap_P\@GOTPCREL(%rip),$idx#d
-+#else
-       mov     OPENSSL_ia32cap_P(%rip),$idx#d
-+#endif
-       bt      \$20,$idx#d
-       jnc     .Lw1stloop
-       bt      \$30,$idx#d
-@@ -338,7 +342,11 @@
- RC4_options:
-       .picmeup %rax
-       lea     .Lopts-.(%rax),%rax
-+#ifdef OPENSSL_PIC
-+      mov     OPENSSL_ia32cap_P\@GOTPCREL(%rip),%edx
-+#else
-       mov     OPENSSL_ia32cap_P(%rip),%edx
-+#endif
-       bt      \$20,%edx
-       jnc     .Ldone
-       add     \$12,%rax
-Index: openssl-0.9.8o/crypto/perlasm/x86unix.pl
-===================================================================
---- openssl-0.9.8o.orig/crypto/perlasm/x86unix.pl      2008-05-01 23:11:32.000000000 +0000
-+++ openssl-0.9.8o/crypto/perlasm/x86unix.pl   2010-06-06 13:09:28.000000000 +0000
-@@ -400,6 +400,29 @@
-       $stack=4;
-       }
-+sub main'function_begin_B_static
-+      {
-+      local($func,$extra)=@_;
-+
-+      &main'external_label($func);
-+      $func=$under.$func;
-+
-+      local($tmp)=<<"EOF";
-+.text
-+EOF
-+      push(@out,$tmp);
-+      if ($main'cpp)
-+              { push(@out,"TYPE($func,\@function)\n"); }
-+      elsif ($main'coff)
-+              { $tmp=push(@out,".def\t$func;\t.scl\t2;\t.type\t32;\t.endef\n"); }
-+      elsif ($main'aout and !$main'pic)
-+              { }
-+      else    { push(@out,".type      $func,\@function\n"); }
-+      push(@out,".align\t$align\n");
-+      push(@out,"$func:\n");
-+      $stack=4;
-+      }
-+
- sub main'function_end
-       {
-       local($func)=@_;
-@@ -694,7 +717,17 @@
-               {
-               $tmp=<<___;
- .section      .init
-+#ifdef OPENSSL_PIC
-+      pushl   %ebx
-+      call    .pic_point0
-+.pic_point0:
-+      popl    %ebx
-+      addl    \$_GLOBAL_OFFSET_TABLE_+[.-.pic_point0],%ebx
-+      call    $under$f\@PLT
-+      popl    %ebx
-+#else
-       call    $under$f
-+#endif
-       jmp     .Linitalign
- .align        $align
- .Linitalign:
-Index: openssl-0.9.8o/crypto/perlasm/cbc.pl
-===================================================================
---- openssl-0.9.8o.orig/crypto/perlasm/cbc.pl  2005-05-09 21:48:00.000000000 +0000
-+++ openssl-0.9.8o/crypto/perlasm/cbc.pl       2010-06-06 13:09:28.000000000 +0000
-@@ -122,7 +122,11 @@
-       &mov(&DWP($data_off,"esp","",0),        "eax"); # put in array for call
-       &mov(&DWP($data_off+4,"esp","",0),      "ebx"); #
--      &call($enc_func);
-+      &call   (&label("pic_point0"));
-+      &set_label("pic_point0");
-+      &blindpop("ebx");
-+      &add    ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point0") . "]");
-+      &call("$enc_func\@PLT");
-       &mov("eax",     &DWP($data_off,"esp","",0));
-       &mov("ebx",     &DWP($data_off+4,"esp","",0));
-@@ -187,7 +191,11 @@
-       &mov(&DWP($data_off,"esp","",0),        "eax"); # put in array for call
-       &mov(&DWP($data_off+4,"esp","",0),      "ebx"); #
--      &call($enc_func);
-+      &call   (&label("pic_point1"));
-+      &set_label("pic_point1");
-+      &blindpop("ebx");
-+      &add    ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point1") . "]");
-+      &call("$enc_func\@PLT");
-       &mov("eax",     &DWP($data_off,"esp","",0));
-       &mov("ebx",     &DWP($data_off+4,"esp","",0));
-@@ -220,7 +228,11 @@
-       &mov(&DWP($data_off,"esp","",0),        "eax"); # put back
-       &mov(&DWP($data_off+4,"esp","",0),      "ebx"); #
--      &call($dec_func);
-+      &call   (&label("pic_point2"));
-+      &set_label("pic_point2");
-+      &blindpop("ebx");
-+      &add    ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point2") . "]");
-+      &call("$dec_func\@PLT");
-       &mov("eax",     &DWP($data_off,"esp","",0));    # get return
-       &mov("ebx",     &DWP($data_off+4,"esp","",0));  #
-@@ -263,7 +275,11 @@
-       &mov(&DWP($data_off,"esp","",0),        "eax"); # put back
-       &mov(&DWP($data_off+4,"esp","",0),      "ebx"); #
--      &call($dec_func);
-+      &call   (&label("pic_point3"));
-+      &set_label("pic_point3");
-+      &blindpop("ebx");
-+      &add    ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point3") . "]");
-+      &call("$dec_func\@PLT");
-       &mov("eax",     &DWP($data_off,"esp","",0));    # get return
-       &mov("ebx",     &DWP($data_off+4,"esp","",0));  #
-Index: openssl-0.9.8o/crypto/perlasm/x86_64-xlate.pl
-===================================================================
---- openssl-0.9.8o.orig/crypto/perlasm/x86_64-xlate.pl 2010-06-06 13:09:00.000000000 +0000
-+++ openssl-0.9.8o/crypto/perlasm/x86_64-xlate.pl      2010-06-06 13:09:28.000000000 +0000
-@@ -435,7 +435,7 @@
-     chomp($line);
--    $line =~ s|[#!].*$||;     # get rid of asm-style comments...
-+#    $line =~ s|[#!].*$||;    # get rid of asm-style comments...
-     $line =~ s|/\*.*\*/||;    # ... and C-style comments...
-     $line =~ s|^\s+||;                # ... and skip white spaces in beginning
-Index: openssl-0.9.8o/crypto/aes/asm/aes-586.pl
-===================================================================
---- openssl-0.9.8o.orig/crypto/aes/asm/aes-586.pl      2008-12-17 14:14:51.000000000 +0000
-+++ openssl-0.9.8o/crypto/aes/asm/aes-586.pl   2010-06-06 13:09:28.000000000 +0000
-@@ -250,7 +250,7 @@
- sub _data_word() { my $i; while(defined($i=shift)) { &data_word($i,$i); } }
- &public_label("AES_Te");
--&function_begin_B("_x86_AES_encrypt");
-+&function_begin_B_static("_x86_AES_encrypt");
-       if ($vertical_spin) {
-               # I need high parts of volatile registers to be accessible...
-               &exch   ($s1="edi",$key="ebx");
-@@ -539,7 +539,7 @@
- }
- &public_label("AES_Td");
--&function_begin_B("_x86_AES_decrypt");
-+&function_begin_B_static("_x86_AES_decrypt");
-       # note that caller is expected to allocate stack frame for me!
-       &mov    (&DWP(12,"esp"),$key);          # save key
-@@ -1461,15 +1461,22 @@
- &public_label("AES_Td");
- &public_label("AES_Te");
- &function_begin_B("AES_set_decrypt_key");
-+      &push   ("ebx");
-       &mov    ("eax",&wparam(0));
-       &mov    ("ecx",&wparam(1));
-       &mov    ("edx",&wparam(2));
-       &sub    ("esp",12);
-+
-+      &call   (&label("pic_point0")); 
-+      &set_label("pic_point0");
-+      &blindpop("ebx");
-+      &add    ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point0") . "]");
-       &mov    (&DWP(0,"esp"),"eax");
-       &mov    (&DWP(4,"esp"),"ecx");
-       &mov    (&DWP(8,"esp"),"edx");
--      &call   ("AES_set_encrypt_key");
-+      &call   ("AES_set_encrypt_key\@PLT");
-       &add    ("esp",12);
-+      &pop    ("ebx");
-       &cmp    ("eax",0);
-       &je     (&label("proceed"));
-       &ret    ();
diff --git a/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/pkg-config.patch b/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/pkg-config.patch
deleted file mode 100644 (file)
index 46c6f03..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8k/Makefile.org
-===================================================================
---- openssl-0.9.8k.orig/Makefile.org   2009-07-19 11:34:56.000000000 +0200
-+++ openssl-0.9.8k/Makefile.org        2009-07-19 11:36:02.000000000 +0200
-@@ -444,7 +444,8 @@
-           echo 'Description: OpenSSL cryptography library'; \
-           echo 'Version: '$(VERSION); \
-           echo 'Requires: '; \
--          echo 'Libs: -L$${libdir} -lcrypto $(EX_LIBS)'; \
-+          echo 'Libs: -L$${libdir} -lcrypto'; \
-+          echo 'Libs.private: $(EX_LIBS)'; \
-           echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc
- libssl.pc: Makefile
-@@ -457,7 +458,8 @@
-           echo 'Description: Secure Sockets Layer and cryptography libraries'; \
-           echo 'Version: '$(VERSION); \
-           echo 'Requires: '; \
--          echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
-+          echo 'Libs: -L$${libdir} -lssl'; \
-+          echo 'Libs.private: -lcrypto $(EX_LIBS)'; \
-           echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
- openssl.pc: Makefile
-@@ -470,7 +472,8 @@
-           echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
-           echo 'Version: '$(VERSION); \
-           echo 'Requires: '; \
--          echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
-+          echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
-+          echo 'Libs.private: $(EX_LIBS)'; \
-           echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
- Makefile: Makefile.org Configure config
diff --git a/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/rc4-amd64.patch b/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/rc4-amd64.patch
deleted file mode 100644 (file)
index f57fbc9..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8k/Configure
-===================================================================
---- openssl-0.9.8k.orig/Configure      2009-07-19 11:32:41.000000000 +0200
-+++ openssl-0.9.8k/Configure   2009-07-19 11:37:10.000000000 +0200
-@@ -128,6 +128,9 @@
- my $x86_out_asm="x86cpuid-out.o:bn86-out.o co86-out.o MAYBE-MO86-out.o:dx86-out.o yx86-out.o:ax86-out.o:bx86-out.o:mx86-out.o:sx86-out.o s512sse2-out.o:cx86-out.o:rx86-out.o rc4_skey.o:rm86-out.o:r586-out.o";
- my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o::";
-+# rc4 asm is disabled on amd64 because we configured it with RC4_CHAR while
-+# the assembler only works with int
-+my $x86_64_asm_linux="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::::";
- my $ia64_asm=":bn-ia64.o::aes_core.o aes_cbc.o aes-ia64.o:::sha1-ia64.o sha256-ia64.o sha512-ia64.o::rc4-ia64.o rc4_skey.o::";
- my $no_asm="::::::::::";
diff --git a/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/rehash-crt.patch b/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/rehash-crt.patch
deleted file mode 100644 (file)
index d9d6b70..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8k/tools/c_rehash.in
-===================================================================
---- openssl-0.9.8k.orig/tools/c_rehash.in      2002-10-11 22:31:27.000000000 +0200
-+++ openssl-0.9.8k/tools/c_rehash.in   2009-07-19 11:36:26.000000000 +0200
-@@ -59,12 +59,15 @@
-               }
-       }
-       closedir DIR;
--      FILE: foreach $fname (grep {/\.pem$/} @flist) {
-+      FILE: foreach $fname (grep {/\.pem$|\.crt$/} @flist) {
-               # Check to see if certificates and/or CRLs present.
-               my ($cert, $crl) = check_file($fname);
-               if(!$cert && !$crl) {
--                      print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n";
--                      next;
-+                      ($cert, $crl) = check_file("$openssl x509 -in \"$fname\" -inform der  -outform pem | ");
-+                      if(!$cert && !$crl) {
-+                              print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n";
-+                              next;
-+                      }
-               }
-               link_hash_cert($fname) if($cert);
-               link_hash_crl($fname) if($crl);
-@@ -102,6 +105,9 @@
-               my $fname = $_[0];
-               $fname =~ s/'/'\\''/g;
-               my ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint -noout -in '$fname'`;
-+              if(!$hash || !fprint) {
-+                      ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint -noout -in '$fname' -inform der`;
-+              }
-               chomp $hash;
-               chomp $fprint;
-               $fprint =~ s/^.*=//;
diff --git a/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/rehash_pod.patch b/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/rehash_pod.patch
deleted file mode 100644 (file)
index 3426ba8..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8k/doc/apps/c_rehash.pod
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ openssl-0.9.8k/doc/apps/c_rehash.pod       2009-07-19 11:36:27.000000000 +0200
-@@ -0,0 +1,55 @@
-+
-+=pod
-+
-+=head1 NAME
-+
-+c_rehash - Create symbolic links to files named by the hash values
-+
-+=head1 SYNOPSIS
-+
-+B<c_rehash>
-+[directory] ...
-+
-+=head1 DESCRIPTION
-+
-+c_rehash scans directories and takes a hash value of each .pem and .crt file in the directory. It then creates symbolic links for each of the files named by the hash value. This is useful as many programs require directories to be set up like this in order to find the certificates they require. 
-+
-+If any directories are named on the command line then these directories are processed in turn. If not then and the environment variable SSL_CERT_DIR is defined then that is consulted. This variable should be a colon (:) separated list of directories, all of which will be processed. If neither of these conditions are true then /usr/lib/ssl/certs is processed. 
-+
-+For each directory that is to be processed he user must have write permissions on the directory, if they do not then nothing will be printed for that directory.
-+
-+Note that this program deletes all the symbolic links that look like ones that it creates before processing a directory. Beware that if you run the program on a directory that contains symbolic links for other purposes that are named in the same format as those created by this program they will be lost.
-+
-+The hashes for certificate files are of the form <hash>.<n> where n is an integer. If the hash value already exists then n will be incremented, unless the file is a duplicate. Duplicates are detected using the fingerprint of the certificate. A warning will be printed if a duplicate is detected. The hashes for CRL files are of the form <hash>.r<n> and have the same behavior.
-+
-+The program will also warn if there are files with extension .pem which are not certificate or CRL files.
-+
-+The program uses the openssl program to compute the hashes and fingerprints. It expects the executable to be named openssl and be on the PATH, or in the /usr/lib/ssl/bin directory. If the OPENSSL environment variable is defined then this is used instead as the executable that provides the hashes and fingerprints. When called as $OPENSSL x509 -hash -fingerprint -noout -in $file it must output the hash of $file on the first line followed by the fingerprint on the second line, optionally prefixed with some text and an equals sign (=). 
-+
-+=head1 OPTIONS
-+
-+None
-+
-+=head1 ENVIRONMENT
-+
-+=over 4
-+
-+=item B<OPENSSL>
-+
-+The name (and path) of an executable to use to generate hashes and fingerprints (see above).
-+
-+=item B<SSL_CERT_DIR>
-+
-+Colon separated list of directories to operate on. Ignored if directories are listed on the command line.
-+
-+=head1 SEE ALSO
-+
-+L<openssl(1)|openssl(1)>, L<x509(1)|x509(1)>
-+
-+=back
-+
-+=head1 BUGS
-+
-+No known bugs
-+
-+=cut
diff --git a/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/series b/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/series
deleted file mode 100644 (file)
index b764c04..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-ca.patch
-config-hurd.patch
-debian-targets.patch
-engines-path.patch
-kfreebsd-pipe.patch
-make-targets.patch
-man-dir.patch
-man-section.patch
-no-rpath.patch
-no-symbolic.patch
-pic.patch
-pkg-config.patch
-valgrind.patch
-rc4-amd64.patch
-rehash-crt.patch
-rehash_pod.patch
-shared-lib-ext.patch
-stddef.patch
-version-script.patch
-perl-path.diff
diff --git a/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/shared-lib-ext.patch b/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/shared-lib-ext.patch
deleted file mode 100644 (file)
index 79eb39f..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8k/Configure
-===================================================================
---- openssl-0.9.8k.orig/Configure      2009-07-19 11:36:24.000000000 +0200
-+++ openssl-0.9.8k/Configure   2009-07-19 11:37:03.000000000 +0200
-@@ -1568,7 +1568,8 @@
-       elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
-               {
-               my $sotmp = $1;
--              s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
-+#             s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
-+              s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/;
-               }
-       elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/)
-               {
diff --git a/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/stddef.patch b/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/stddef.patch
deleted file mode 100644 (file)
index 3436b29..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8k/crypto/sha/sha.h
-===================================================================
---- openssl-0.9.8k.orig/crypto/sha/sha.h       2008-09-16 12:47:28.000000000 +0200
-+++ openssl-0.9.8k/crypto/sha/sha.h    2009-07-19 11:36:28.000000000 +0200
-@@ -59,6 +59,7 @@
- #ifndef HEADER_SHA_H
- #define HEADER_SHA_H
-+#include <stddef.h>
- #include <openssl/e_os2.h>
- #include <stddef.h>
diff --git a/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/version-script.patch b/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/version-script.patch
deleted file mode 100644 (file)
index 6fa3d75..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8m/Configure
-===================================================================
---- openssl-0.9.8m.orig/Configure      2010-02-27 12:28:32.000000000 +0100
-+++ openssl-0.9.8m/Configure   2010-02-27 12:28:35.000000000 +0100
-@@ -1512,6 +1512,8 @@
-               }
-       }
-+$shared_ldflag .= " -Wl,--version-script=openssl.ld";
-+
- open(IN,'<Makefile.org') || die "unable to read Makefile.org:$!\n";
- unlink("$Makefile.new") || die "unable to remove old $Makefile.new:$!\n" if -e "$Makefile.new";
- open(OUT,">$Makefile.new") || die "unable to create $Makefile.new:$!\n";
-Index: openssl-0.9.8m/openssl.ld
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ openssl-0.9.8m/openssl.ld  2010-02-27 12:28:35.000000000 +0100
-@@ -0,0 +1,5 @@
-+OPENSSL_0.9.8 {
-+       global:
-+               *;
-+};
-+
-Index: openssl-0.9.8m/engines/openssl.ld
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ openssl-0.9.8m/engines/openssl.ld  2010-02-27 12:28:35.000000000 +0100
-@@ -0,0 +1,5 @@
-+OPENSSL_0.9.8 {
-+       global:
-+               *;
-+};
-+
diff --git a/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/find.pl b/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/find.pl
deleted file mode 100644 (file)
index 8e1b42c..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
-
-# This library is deprecated and unmaintained. It is included for
-# compatibility with Perl 4 scripts which may use it, but it will be
-# removed in a future version of Perl. Please use the File::Find module
-# instead.
-
-# Usage:
-#      require "find.pl";
-#
-#      &find('/foo','/bar');
-#
-#      sub wanted { ... }
-#              where wanted does whatever you want.  $dir contains the
-#              current directory name, and $_ the current filename within
-#              that directory.  $name contains "$dir/$_".  You are cd'ed
-#              to $dir when the function is called.  The function may
-#              set $prune to prune the tree.
-#
-# For example,
-#
-#   find / -name .nfs\* -mtime +7 -exec rm -f {} \; -o -fstype nfs -prune
-#
-# corresponds to this
-#
-#      sub wanted {
-#          /^\.nfs.*$/ &&
-#          (($dev,$ino,$mode,$nlink,$uid,$gid) = lstat($_)) &&
-#          int(-M _) > 7 &&
-#          unlink($_)
-#          ||
-#          ($nlink || (($dev,$ino,$mode,$nlink,$uid,$gid) = lstat($_))) &&
-#          $dev < 0 &&
-#          ($prune = 1);
-#      }
-#
-# Set the variable $dont_use_nlink if you're using AFS, since AFS cheats.
-
-use File::Find ();
-
-*name          = *File::Find::name;
-*prune         = *File::Find::prune;
-*dir           = *File::Find::dir;
-*topdir                = *File::Find::topdir;
-*topdev                = *File::Find::topdev;
-*topino                = *File::Find::topino;
-*topmode       = *File::Find::topmode;
-*topnlink      = *File::Find::topnlink;
-
-sub find {
-    &File::Find::find(\&wanted, @_);
-}
-
-1;
diff --git a/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/parallel-make-fix.patch b/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/parallel-make-fix.patch
deleted file mode 100644 (file)
index 82857f5..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-Upstream-Status: Submitted
-
-fix the parallel build regarding shared libraries.
-
-Signed-off-by: Qing He <qing.he@intel.com>
-
-diff --git a/Makefile.org b/Makefile.org
-index 2fb0309..8bec3d0 100644
---- a/Makefile.org
-+++ b/Makefile.org
-@@ -352,6 +352,9 @@ all_testapps: build_libs build_testapps
- build_testapps:
-       @dir=crypto; target=testapps; $(BUILD_ONE_CMD)
-+libcrypto.a: build_crypto
-+libssl.a: build_ssl
-+
- build_shared: $(SHARED_LIBS)
- libcrypto$(SHLIB_EXT): libcrypto.a $(SHARED_FIPS)
-       @if [ "$(SHLIB_TARGET)" != "" ]; then \
diff --git a/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/shared-libs.patch b/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/shared-libs.patch
deleted file mode 100644 (file)
index 19de112..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-diff --git a/Makefile.org b/Makefile.org
-index e87d623..25ff367 100644
---- a/Makefile.org
-+++ b/Makefile.org
-@@ -355,7 +355,7 @@ libcrypto$(SHLIB_EXT): libcrypto.a $(SHARED_FIPS)
-       @if [ "$(SHLIB_TARGET)" != "" ]; then \
-               if [ "$(FIPSCANLIB)" = "libfips" ]; then \
-                       $(ARD) libcrypto.a fipscanister.o ; \
--                      $(MAKE) SHLIBDIRS='crypto' SHLIBDEPS='-lfips' build-shared; \
-+                      $(MAKE) -e SHLIBDIRS='crypto' SHLIBDEPS='-lfips' build-shared; \
-                       $(AR) libcrypto.a fips/fipscanister.o ; \
-               else \
-                       if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \
-@@ -373,7 +373,7 @@ libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a
-       @if [ "$(SHLIB_TARGET)" != "" ]; then \
-               shlibdeps=-lcrypto; \
-               [ "$(FIPSCANLIB)" = "libfips" ] && shlibdeps="$$shlibdeps -lfips"; \
--              $(MAKE) SHLIBDIRS=ssl SHLIBDEPS="$$shlibdeps" build-shared; \
-+              $(MAKE) -e SHLIBDIRS=ssl SHLIBDEPS="$$shlibdeps" build-shared; \
-       else \
-               echo "There's no support for shared libraries on this platform" >&2 ; \
-               exit 1; \
-diff --git a/crypto/Makefile b/crypto/Makefile
-index 6557f2b..a69bf7c 100644
---- a/crypto/Makefile
-+++ b/crypto/Makefile
-@@ -103,7 +103,7 @@ $(LIB):    $(LIBOBJ)
- shared: buildinf.h lib subdirs
-       if [ -n "$(SHARED_LIBS)" ]; then \
--              (cd ..; $(MAKE) $(SHARED_LIB)); \
-+              (cd ..; $(MAKE) -e $(SHARED_LIB)); \
-       fi
- libs:
-diff --git a/ssl/Makefile b/ssl/Makefile
-index 5ac3507..77ea2bd 100644
---- a/ssl/Makefile
-+++ b/ssl/Makefile
-@@ -62,7 +62,7 @@ lib: $(LIBOBJ)
- shared: lib
-       if [ -n "$(SHARED_LIBS)" ]; then \
--              (cd ..; $(MAKE) $(SHARED_LIB)); \
-+              (cd ..; $(MAKE) -e $(SHARED_LIB)); \
-       fi
- files:
diff --git a/meta-openvuplus/recipes-connectivity/openssl/openssl_0.9.8x.bb b/meta-openvuplus/recipes-connectivity/openssl/openssl_0.9.8x.bb
deleted file mode 100644 (file)
index b341267..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-require recipes-connectivity/openssl/openssl.inc
-
-PR = "${INC_PR}.1"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
-
-SRC_URI += "file://debian/ca.patch \
-            file://debian/config-hurd.patch;apply=no \
-            file://debian/debian-targets.patch \
-            file://debian/engines-path.patch \
-            file://debian/kfreebsd-pipe.patch;apply=no \
-            file://debian/make-targets.patch \
-            file://debian/man-dir.patch \
-            file://debian/man-section.patch \
-            file://debian/no-rpath.patch \
-            file://debian/no-symbolic.patch \
-            file://debian/pic.patch \
-            file://debian/pkg-config.patch \
-            file://debian/rc4-amd64.patch \
-            file://debian/rehash-crt.patch \
-            file://debian/rehash_pod.patch \
-            file://debian/shared-lib-ext.patch \
-            file://debian/stddef.patch \
-            file://debian/version-script.patch \
-            file://debian/perl-path.diff"
-
-SRC_URI += "file://configure-targets.patch \
-            file://shared-libs.patch \
-            file://parallel-make-fix.patch \
-            file://find.pl"
-
-SRC_URI[md5sum] = "ee17e9bc805c8cc7d0afac3b0ef78eda"
-SRC_URI[sha256sum] = "7ce0c7f2c451070b4497ea7ca6f23eba6cef1a56db2e86e433f65926a7bc7497"
-
-EXTRA_OECONF += "no-idea no-mdc2 no-rc5"
-
-do_configure_prepend() {
-        cp ${WORKDIR}/find.pl ${S}/util/find.pl
-}
-
-BBCLASSEXTEND = "native nativesdk"
-
-PARALLEL_MAKEINST = ""
diff --git a/meta-openvuplus/recipes-connectivity/packagegroups/packagegroup-vuplus-wlan.bb b/meta-openvuplus/recipes-connectivity/packagegroups/packagegroup-vuplus-wlan.bb
new file mode 100644 (file)
index 0000000..c1a3450
--- /dev/null
@@ -0,0 +1,57 @@
+DESCRIPTION = "Vuplus: W-LAN package group for the Vuplus Distribution"
+SECTION = "vuplus/base"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+PR = "r16"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+inherit packagegroup
+
+DEPENDS_${PN} = "enigma2"
+RDEPENDS_${PN} = "\
+       enigma2-plugin-systemplugins-wirelesslansetup \
+       wireless-tools \
+       wpa-supplicant \
+"
+
+WIFI_FIRMWARES = "\
+       rt73-firmware \
+       zd1211-firmware \
+       firmware-htc9271 \
+       firmware-rt2561 \
+       firmware-rtl8721u \
+       firmware-rt3070 \
+"
+
+KERNEL_WIFI_MODULES = " \
+       kernel-module-ath9k-htc \
+       kernel-module-carl9170 \
+       kernel-module-prism2-usb \
+       kernel-module-rt73usb \
+       kernel-module-rt2500usb \
+       kernel-module-rtl8187 \
+       kernel-module-r8712u \
+       kernel-module-w35und \
+       kernel-module-zd1211rw \
+       kernel-module-llc \
+       kernel-module-stp \
+       kernel-module-bridge \
+       kernel-module-hostap \
+       kernel-module-rt2800usb \
+"
+
+KERNEL_WIFI_MODULES += "${@base_version_less_or_equal('VUPLUS_KERNEL_VERSION', '3.1.1', 'kernel-module-r8192u-usb', '', d)}"
+
+LEGACY_MODULES = " \
+       rt3070 \
+       r8192cu \
+"
+
+RDEPENDS_${PN}_append = "\
+       ${WIFI_FIRMWARES} \
+       ${KERNEL_WIFI_MODULES} \
+       ${LEGACY_MODULES} \
+       rt2870sta \
+"
+
diff --git a/meta-openvuplus/recipes-connectivity/ppp/ppp_2.4.5.bbappend b/meta-openvuplus/recipes-connectivity/ppp/ppp_2.4.5.bbappend
deleted file mode 100644 (file)
index e6587d2..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-PR .= "-vuplus0"
-
-do_install_append() {
-       rm ${D}/${sysconfdir}/ppp/options
-       rm ${D}/${sysconfdir}/ppp/pap-secrets
-}
-
-CONFFILES_${PN} = "${sysconfdir}/ppp/chap-secrets"
diff --git a/meta-openvuplus/recipes-connectivity/ppp/ppp_2.4.6.bbappend b/meta-openvuplus/recipes-connectivity/ppp/ppp_2.4.6.bbappend
new file mode 100644 (file)
index 0000000..e6587d2
--- /dev/null
@@ -0,0 +1,8 @@
+PR .= "-vuplus0"
+
+do_install_append() {
+       rm ${D}/${sysconfdir}/ppp/options
+       rm ${D}/${sysconfdir}/ppp/pap-secrets
+}
+
+CONFFILES_${PN} = "${sysconfdir}/ppp/chap-secrets"
diff --git a/meta-openvuplus/recipes-connectivity/realtek/r8192cu-3.1.2590.20110922/linux_3.1.patch b/meta-openvuplus/recipes-connectivity/realtek/r8192cu-3.1.2590.20110922/linux_3.1.patch
deleted file mode 100644 (file)
index 3d6e3d2..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/include/osdep_service.h b/include/osdep_service.h
-index 4aa6478..c15539b 100755
---- a/include/osdep_service.h
-+++ b/include/osdep_service.h
-@@ -46,7 +46,6 @@
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,5))
-       #include <linux/kref.h>
- #endif
--      #include <linux/smp_lock.h>
-       #include <linux/netdevice.h>
-       #include <linux/skbuff.h>
-       #include <linux/circ_buf.h>
-diff --git a/include/rtw_io.h b/include/rtw_io.h
-index 15065c6..dab90b7 100755
---- a/include/rtw_io.h
-+++ b/include/rtw_io.h
-@@ -33,7 +33,6 @@
- #include <linux/semaphore.h>
- #endif
- #include <linux/list.h>
--#include <linux/smp_lock.h>
- #include <linux/spinlock.h>
- #include <asm/atomic.h>
diff --git a/meta-openvuplus/recipes-connectivity/realtek/r8192cu-3.1.2590.20110922/makefile.patch b/meta-openvuplus/recipes-connectivity/realtek/r8192cu-3.1.2590.20110922/makefile.patch
deleted file mode 100755 (executable)
index a8539ca..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/Makefile b/Makefile
-index b3ccaf2..9e44425 100755
---- a/Makefile
-+++ b/Makefile
-@@ -39,7 +39,7 @@ CONFIG_PLATFORM_ANDROID_X86 = n
- CONFIG_PLATFORM_ARM_S3C2K4 = n
- CONFIG_PLATFORM_ARM_PXA2XX = n
- CONFIG_PLATFORM_ARM_S3C6K4 = n
--CONFIG_PLATFORM_MIPS_RMI = n
-+CONFIG_PLATFORM_MIPS_RMI = y
- CONFIG_PLATFORM_RTD2880B = n
- CONFIG_PLATFORM_MIPS_AR9132 = n
- CONFIG_PLATFORM_RTK_DMP = n
-@@ -288,9 +288,9 @@ endif
- ifeq ($(CONFIG_PLATFORM_MIPS_RMI), y)
- EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
- ARCH:=mips
--CROSS_COMPILE:=mipsisa32r2-uclibc-
--KVER:= 
--KSRC:= /root/work/kernel_realtek
-+#CROSS_COMPILE:=mipsisa32r2-uclibc-
-+#KVER:= 
-+#KSRC:= /root/work/kernel_realtek
- endif
- ifeq ($(CONFIG_PLATFORM_MIPS_PLM), y)
diff --git a/meta-openvuplus/recipes-connectivity/realtek/r8192cu-3.1.2590.20110922/rtl8192_8188CU_linux_v3.1.2590.20110922.tar.gz b/meta-openvuplus/recipes-connectivity/realtek/r8192cu-3.1.2590.20110922/rtl8192_8188CU_linux_v3.1.2590.20110922.tar.gz
deleted file mode 100644 (file)
index 5b3a020..0000000
Binary files a/meta-openvuplus/recipes-connectivity/realtek/r8192cu-3.1.2590.20110922/rtl8192_8188CU_linux_v3.1.2590.20110922.tar.gz and /dev/null differ
diff --git a/meta-openvuplus/recipes-connectivity/realtek/r8192cu-3.4.4.4749.20121105/r8192cu_build_fix.patch b/meta-openvuplus/recipes-connectivity/realtek/r8192cu-3.4.4.4749.20121105/r8192cu_build_fix.patch
deleted file mode 100644 (file)
index 9979e51..0000000
+++ /dev/null
@@ -1,1614 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  OpenELEC is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-commit 710c9ba0aab6c2d50b046b22f1405b12b7ebbff3
-Author: hschang <chang@dev3>
-Date:   Tue Feb 25 16:49:51 2014 +0900
-
-    patch for lastest kernel(>= 3.10.0)
-
-diff --git a/core/rtw_debug.c b/core/rtw_debug.c
-index 04e472d..d4f6e7d 100644
---- a/core/rtw_debug.c
-+++ b/core/rtw_debug.c
-@@ -62,6 +62,7 @@
- #ifdef CONFIG_PROC_DEBUG
- #include <rtw_version.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) 
- int proc_get_drv_version(char *page, char **start,
-                         off_t offset, int count,
-                         int *eof, void *data)
-@@ -75,7 +76,15 @@ int proc_get_drv_version(char *page, char **start,
-       *eof = 1;
-       return len;
- }
-+#else
-+int proc_get_drv_version(struct seq_file *m, void* data)
-+{
-+      seq_printf(m, "%s\n", DRIVERVERSION);
-+      return 0;
-+}
-+#endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) 
- int proc_get_write_reg(char *page, char **start,
-                         off_t offset, int count,
-                         int *eof, void *data)
-@@ -83,7 +92,14 @@ int proc_get_write_reg(char *page, char **start,
-       *eof = 1;
-       return 0;
- }
-+#else
-+int proc_get_write_reg(struct seq_file *m, void* data)
-+{
-+      return 0;
-+}
-+#endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) 
- int proc_set_write_reg(struct file *file, const char *buffer,
-               unsigned long count, void *data)
- {
-@@ -128,10 +144,59 @@ int proc_set_write_reg(struct file *file, const char *buffer,
-       return count;
-       
- }
-+#else
-+int proc_set_write_reg_open(struct seq_file *m, void* data)
-+{
-+      return 0;
-+}
-+
-+ssize_t proc_set_write_reg(struct file *file, const char *buffer, size_t count, loff_t *pos)
-+{
-+      struct net_device *dev = (struct net_device *)pos;
-+      _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
-+      char tmp[32];
-+      u32 addr, val, len;
-+
-+      if (count < 3)
-+      {
-+              DBG_8192C("argument size is less than 3\n");
-+              return -EFAULT;
-+      }       
-+      len = min(count, sizeof(tmp)-1);
-+      if (buffer && !copy_from_user(tmp, buffer, len)) {
-+              tmp[len] = '\0';
-+              
-+              if(sscanf(tmp, "%x %x %x", &addr, &val, &len)!=3) {
-+                      DBG_8192C("invalid write_reg parameter!\n");
-+                      return -EFAULT;
-+              }
-+
-+              switch(len)
-+              {
-+                      case 1:
-+                              rtw_write8(padapter, addr, (u8)val);                            
-+                              break;
-+                      case 2:
-+                              rtw_write16(padapter, addr, (u16)val);                          
-+                              break;
-+                      case 4:
-+                              rtw_write32(padapter, addr, val);                               
-+                              break;
-+                      default:
-+                              DBG_8192C("error write length=%d", len);
-+                              break;
-+              }                       
-+              
-+      }
-+      
-+      return count;
-+}
-+#endif
- static u32 proc_get_read_addr=0xeeeeeeee;
- static u32 proc_get_read_len=0x4;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) 
- int proc_get_read_reg(char *page, char **start,
-                         off_t offset, int count,
-                         int *eof, void *data)
-@@ -199,7 +264,77 @@ int proc_set_read_reg(struct file *file, const char *buffer,
-       return count;
- }
-+#else
-+int proc_get_read_reg(struct seq_file *m, void* data)
-+{     
-+      struct net_device *dev = m->private;
-+      _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
-+      if(proc_get_read_addr==0xeeeeeeee)
-+      {
-+              return 0;
-+      }
-+
-+      switch(proc_get_read_len)
-+      {
-+              case 1:                 
-+                      seq_printf(m, "rtw_read8(0x%x)=0x%x\n", proc_get_read_addr, rtw_read8(padapter, proc_get_read_addr));
-+                      break;
-+              case 2:
-+                      seq_printf(m, "rtw_read16(0x%x)=0x%x\n", proc_get_read_addr, rtw_read16(padapter, proc_get_read_addr));
-+                      break;
-+              case 4:
-+                      seq_printf(m, "rtw_read32(0x%x)=0x%x\n", proc_get_read_addr, rtw_read32(padapter, proc_get_read_addr));
-+                      break;
-+              default:
-+                      seq_printf(m, "error read length=%d\n", proc_get_read_len);
-+                      break;
-+      }
-+      return 0;
-+}
-+
-+ssize_t proc_set_read_reg(struct file *file, const char *buf,
-+              size_t count, loff_t *pos)
-+{
-+      struct net_device *dev = (struct net_device *)pos;
-+      _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
-+      
-+      char *cmd, *buffer;
-+      
-+      u32 addr, len, num;
-+
-+      if (count < 2)
-+      {
-+              DBG_8192C("argument size is less than 2\n");
-+              return -EFAULT;
-+      }       
-+      cmd = kmalloc(count+1, GFP_KERNEL);
-+      if(!cmd)
-+          return -ENOMEM;
-+      if(!copy_from_user(cmd, buf, count)) {
-+
-+              cmd[count]='\0';
-+              buffer = cmd;
-+              
-+              num = sscanf(buffer, "%x %x", &addr, &len);
-+
-+              if (num !=  2) {
-+                      DBG_8192C("invalid read_reg parameter!\n");
-+                      return count;
-+              }
-+
-+              proc_get_read_addr = addr;
-+              proc_get_read_len = len;
-+      }else{
-+          kfree(cmd);
-+          return -EFAULT;
-+      }
-+      kfree(cmd);
-+      return count;
-+}
-+#endif
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- int proc_get_fwstate(char *page, char **start,
-                         off_t offset, int count,
-                         int *eof, void *data)
-@@ -215,7 +350,18 @@ int proc_get_fwstate(char *page, char **start,
-       *eof = 1;
-       return len;
- }
-+#else
-+int proc_get_fwstate(struct seq_file *m, void* data)
-+{
-+      struct net_device *dev = m->private;
-+      _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
-+      struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
-+      seq_printf(m, "fwstate=0x%x\n",get_fwstate(pmlmepriv));
-+      return 0;
-+}
-+#endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- int proc_get_sec_info(char *page, char **start,
-                         off_t offset, int count,
-                         int *eof, void *data)
-@@ -233,7 +379,20 @@ int proc_get_sec_info(char *page, char **start,
-       *eof = 1;
-       return len;
- }
-+#else
-+int proc_get_sec_info(struct seq_file *m, void* data)
-+{
-+      struct net_device *dev = m->private;
-+      _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
-+      struct security_priv *psecuritypriv = &padapter->securitypriv;
-+      seq_printf(m, "auth_alg=0x%x, enc_alg=0x%x, auth_type=0x%x, enc_type=0x%x\n", 
-+                                              psecuritypriv->dot11AuthAlgrthm, psecuritypriv->dot11PrivacyAlgrthm,
-+                                              psecuritypriv->ndisauthtype, psecuritypriv->ndisencryptstatus);
-+      return 0;
-+}
-+#endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- int proc_get_mlmext_state(char *page, char **start,
-                         off_t offset, int count,
-                         int *eof, void *data)
-@@ -250,7 +409,19 @@ int proc_get_mlmext_state(char *page, char **start,
-       *eof = 1;
-       return len;
- }
-+#else
-+int proc_get_mlmext_state(struct seq_file *m, void *data)
-+{
-+      struct net_device *dev = m->private;
-+      _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);  
-+      struct mlme_ext_priv    *pmlmeext = &padapter->mlmeextpriv;
-+      struct mlme_ext_info    *pmlmeinfo = &(pmlmeext->mlmext_info);
-+      seq_printf(m, "pmlmeinfo->state=0x%x\n", pmlmeinfo->state);
-+      return 0;
-+}
-+#endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- int proc_get_qos_option(char *page, char **start,
-                         off_t offset, int count,
-                         int *eof, void *data)
-@@ -267,7 +438,18 @@ int proc_get_qos_option(char *page, char **start,
-       return len;
- }
-+#else
-+int proc_get_qos_option(struct seq_file *m, void *data)
-+{
-+      struct net_device *dev = m->private;
-+      _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
-+      struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
-+      seq_printf(m, "qos_option=%d\n", pmlmepriv->qospriv.qos_option);
-+      return 0;
-+}
-+#endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- int proc_get_ht_option(char *page, char **start,
-                         off_t offset, int count,
-                         int *eof, void *data)
-@@ -283,7 +465,18 @@ int proc_get_ht_option(char *page, char **start,
-       *eof = 1;
-       return len;
- }
-+#else
-+int proc_get_ht_option(struct seq_file *m, void *data)
-+{
-+      struct net_device *dev = m->private;
-+      _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
-+      struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
-+      seq_printf(m, "ht_option=%d\n", pmlmepriv->htpriv.ht_option);
-+      return 0;
-+}
-+#endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- int proc_get_rf_info(char *page, char **start,
-                         off_t offset, int count,
-                         int *eof, void *data)
-@@ -301,7 +494,19 @@ int proc_get_rf_info(char *page, char **start,
-       return len;
- }
-+#else
-+int proc_get_rf_info(struct seq_file *m, void *data)
-+{
-+      struct net_device *dev = m->private;
-+      _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);  
-+      struct mlme_ext_priv    *pmlmeext = &padapter->mlmeextpriv;     
-+      seq_printf(m, "cur_ch=%d, cur_bw=%d, cur_ch_offet=%d\n",
-+                      pmlmeext->cur_channel, pmlmeext->cur_bwmode, pmlmeext->cur_ch_offset);
-+      return 0;
-+}
-+#endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- int proc_get_ap_info(char *page, char **start,
-                         off_t offset, int count,
-                         int *eof, void *data)
-@@ -350,7 +555,53 @@ int proc_get_ap_info(char *page, char **start,
-       return len;
- }
-+#else
-+int proc_get_ap_info(struct seq_file *m, void *data)
-+{
-+      struct sta_info *psta;
-+      struct net_device *dev = m->private;
-+      _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
-+      struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
-+      struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
-+      struct wlan_network *cur_network = &(pmlmepriv->cur_network);
-+      struct sta_priv *pstapriv = &padapter->stapriv;
-+      int len = 0;
-+
-+      psta = rtw_get_stainfo(pstapriv, cur_network->network.MacAddress);
-+      if(psta)
-+      {
-+              int i;
-+              struct recv_reorder_ctrl *preorder_ctrl;
-+                                      
-+              seq_printf(m, "SSID=%s\n", cur_network->network.Ssid.Ssid);             
-+              seq_printf(m, "sta's macaddr:" MAC_FMT "\n", MAC_ARG(psta->hwaddr));
-+              seq_printf(m, "cur_channel=%d, cur_bwmode=%d, cur_ch_offset=%d\n", pmlmeext->cur_channel, pmlmeext->cur_bwmode, pmlmeext->cur_ch_offset);               
-+              seq_printf(m, "rtsen=%d, cts2slef=%d\n", psta->rtsen, psta->cts2self);
-+              seq_printf(m, "qos_en=%d, ht_en=%d, init_rate=%d\n", psta->qos_option, psta->htpriv.ht_option, psta->init_rate);        
-+              seq_printf(m, "state=0x%x, aid=%d, macid=%d, raid=%d\n", psta->state, psta->aid, psta->mac_id, psta->raid);     
-+              seq_printf(m, "bwmode=%d, ch_offset=%d, sgi=%d\n", psta->htpriv.bwmode, psta->htpriv.ch_offset, psta->htpriv.sgi);                                              
-+              seq_printf(m, "ampdu_enable = %d\n", psta->htpriv.ampdu_enable);        
-+              seq_printf(m, "agg_enable_bitmap=%x, candidate_tid_bitmap=%x\n", psta->htpriv.agg_enable_bitmap, psta->htpriv.candidate_tid_bitmap);
-+                                      
-+              for(i=0;i<16;i++)
-+              {                                                       
-+                      preorder_ctrl = &psta->recvreorder_ctrl[i];
-+                      if(preorder_ctrl->enable)
-+                      {
-+                              seq_printf(m, "tid=%d, indicate_seq=%d\n", i, preorder_ctrl->indicate_seq);
-+                      }
-+              }       
-+              
-+      }
-+      else
-+      {
-+              seq_printf(m, "can't get sta's macaddr, cur_network's macaddr:" MAC_FMT "\n", MAC_ARG(cur_network->network.MacAddress));
-+      }
-+      return 0;
-+}
-+#endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- int proc_get_adapter_state(char *page, char **start,
-                         off_t offset, int count,
-                         int *eof, void *data)
-@@ -366,7 +617,18 @@ int proc_get_adapter_state(char *page, char **start,
-       return len;
- }
--      
-+#else
-+int proc_get_adapter_state(struct seq_file *m, void *data)
-+{
-+      struct net_device *dev = m->private;
-+      _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
-+      seq_printf(m, "bSurpriseRemoved=%d, bDriverStopped=%d\n", 
-+                      padapter->bSurpriseRemoved, padapter->bDriverStopped);
-+      return 0;
-+}
-+#endif
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- int proc_get_trx_info(char *page, char **start,
-                         off_t offset, int count,
-                         int *eof, void *data)
-@@ -387,8 +649,23 @@ int proc_get_trx_info(char *page, char **start,
-       return len;
- }
--      
--              
-+#else
-+int proc_get_trx_info(struct seq_file *m, void *data)
-+{
-+      struct net_device *dev = m->private;
-+      _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
-+      struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
-+      struct recv_priv  *precvpriv = &padapter->recvpriv;
-+      seq_printf(m, "free_xmitbuf_cnt=%d, free_xmitframe_cnt=%d, free_ext_xmitbuf_cnt=%d, free_recvframe_cnt=%d\n", 
-+              pxmitpriv->free_xmitbuf_cnt, pxmitpriv->free_xmitframe_cnt,pxmitpriv->free_xmit_extbuf_cnt, precvpriv->free_recvframe_cnt);
-+#ifdef CONFIG_USB_HCI
-+      seq_printf(m, "rx_urb_pending_cn=%d\n", precvpriv->rx_pending_cnt);
-+#endif
-+      return 0;
-+}
-+#endif
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- int proc_get_rx_signal(char *page, char **start,
-                         off_t offset, int count,
-                         int *eof, void *data)
-@@ -452,7 +729,62 @@ int proc_set_rx_signal(struct file *file, const char *buffer,
-       return count;
-       
- }
-+#else
-+int proc_get_rx_signal(struct seq_file *m, void *data)
-+{
-+      struct net_device *dev = m->private;
-+      _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
-+      struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
-+      seq_printf(m,
-+              "rssi:%d\n"
-+              "rxpwdb:%d\n"
-+              "signal_strength:%u\n"
-+              "signal_qual:%u\n"
-+              "noise:%u\n", 
-+              padapter->recvpriv.rssi,
-+              padapter->recvpriv.rxpwdb,
-+              padapter->recvpriv.signal_strength,
-+              padapter->recvpriv.signal_qual,
-+              padapter->recvpriv.noise
-+              );
-+      return 0;
-+}
-+ssize_t proc_set_rx_signal(struct file *file, const char *buffer, size_t count, loff_t *pos)
-+{
-+      struct net_device *dev = (struct net_device *)pos;
-+      _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
-+      char tmp[32];
-+      u32 is_signal_dbg, signal_strength;
-+
-+      if (count < 1)
-+              return -EFAULT;
-+
-+      if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) {
-+
-+              int num = sscanf(tmp, "%u %u", &is_signal_dbg, &signal_strength);
-+
-+              is_signal_dbg = is_signal_dbg==0?0:1;
-+              
-+              if(is_signal_dbg && num!=2)
-+                      return count;
-+                      
-+              signal_strength = signal_strength>100?100:signal_strength;
-+              signal_strength = signal_strength<0?0:signal_strength;
-+
-+              padapter->recvpriv.is_signal_dbg = is_signal_dbg;
-+              padapter->recvpriv.signal_strength_dbg=signal_strength;
-+
-+              if(is_signal_dbg)
-+                      DBG_871X("set %s %u\n", "DBG_SIGNAL_STRENGTH", signal_strength);
-+              else
-+                      DBG_871X("set %s\n", "HW_SIGNAL_STRENGTH");
-+      }
-+      return count;
-+}
-+#endif
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- int proc_get_ampdu_enable(char *page, char **start,
-                         off_t offset, int count,
-                         int *eof, void *data)
-@@ -499,7 +831,46 @@ int proc_set_ampdu_enable(struct file *file, const char *buffer,
-       return count;
-       
- }
-+#else
-+int proc_get_ampdu_enable(struct seq_file *m, void *data)
-+{
-+      struct net_device *dev = m->private;
-+      _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
-+      struct registry_priv    *pregpriv = &padapter->registrypriv;
-+      if(pregpriv)
-+              seq_printf(m,
-+                      "%d\n",
-+                      pregpriv->ampdu_enable
-+                      );
-+      return 0;
-+}
-+
-+ssize_t proc_set_ampdu_enable(struct file *file, const char *buffer, size_t count, loff_t *pos)
-+{
-+      struct net_device *dev = (struct net_device *)pos;
-+      _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
-+      struct registry_priv    *pregpriv = &padapter->registrypriv;
-+      char tmp[32];
-+      u32 mode;
-+
-+      if (count < 1)
-+              return -EFAULT;
-+
-+      if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) {              
-+
-+              int num = sscanf(tmp, "%d ", &mode);
-+
-+              if( pregpriv && mode >= 0 && mode < 3 )
-+              {
-+                      pregpriv->ampdu_enable= mode;
-+                      printk("ampdu_enable=%d\n", mode);
-+              }
-+      }
-+      return count;
-+}
-+#endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- int proc_get_rssi_disp(char *page, char **start,
-                         off_t offset, int count,
-                         int *eof, void *data)
-@@ -547,10 +918,52 @@ int proc_set_rssi_disp(struct file *file, const char *buffer,
-       return count;
-       
- }     
-+#else
-+int proc_get_rssi_disp(struct seq_file *m, void *data)
-+{
-+      return 0;
-+}
-+
-+ssize_t proc_set_rssi_disp(struct file *file, const char *buffer, size_t count, loff_t *pos)
-+{
-+      struct net_device *dev = (struct net_device *)pos;
-+      _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
-+      char tmp[32];
-+      u32 enable=0;
-+      if (count < 1)
-+      {
-+              DBG_8192C("argument size is less than 1\n");
-+              return -EFAULT;
-+      }       
-+
-+      if (buffer && !copy_from_user(tmp, buffer, sizeof(tmp))) {              
-+
-+              int num = sscanf(tmp, "%x", &enable);
-+
-+              if (num !=  1) {
-+                      DBG_8192C("invalid set_rssi_disp parameter!\n");
-+                      return count;
-+              }
-               
-+              if(enable)
-+              {                       
-+                      DBG_8192C("Turn On Rx RSSI Display Function\n");
-+                      padapter->bRxRSSIDisplay = enable ;                     
-+              }
-+              else
-+              {
-+                      DBG_8192C("Turn Off Rx RSSI Display Function\n");
-+                      padapter->bRxRSSIDisplay = 0 ;
-+              }
-+      }
-+      return count;
-+}
-+#endif
-+
- #ifdef CONFIG_AP_MODE
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- int proc_get_all_sta_info(char *page, char **start,
-                         off_t offset, int count,
-                         int *eof, void *data)
-@@ -620,14 +1033,74 @@ int proc_get_all_sta_info(char *page, char **start,
-       return len;
- }
--      
--#endif                
-+#else
-+int proc_get_all_sta_info(struct seq_file *m, void *data)
-+{
-+      _irqL irqL;
-+      struct sta_info *psta;
-+      struct net_device *dev = m->private;
-+      _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
-+      struct sta_priv *pstapriv = &padapter->stapriv;
-+      int i, j;
-+      _list   *plist, *phead;
-+      struct recv_reorder_ctrl *preorder_ctrl;
-+      seq_printf(m, "sta_dz_bitmap=0x%x, tim_bitmap=0x%x\n", pstapriv->sta_dz_bitmap, pstapriv->tim_bitmap);
-+                                      
-+      _enter_critical_bh(&pstapriv->sta_hash_lock, &irqL);
-+
-+      for(i=0; i< NUM_STA; i++)
-+      {
-+              phead = &(pstapriv->sta_hash[i]);
-+              plist = get_next(phead);
-+              
-+              while ((rtw_end_of_queue_search(phead, plist)) == _FALSE)
-+              {
-+                      psta = LIST_CONTAINOR(plist, struct sta_info, hash_list);
-+
-+                      plist = get_next(plist);
-+
-+                      //if(extra_arg == psta->aid)
-+                      {
-+                              seq_printf(m, "sta's macaddr:" MAC_FMT "\n", MAC_ARG(psta->hwaddr));
-+                              seq_printf(m, "rtsen=%d, cts2slef=%d\n", psta->rtsen, psta->cts2self);
-+                              seq_printf(m, "qos_en=%d, ht_en=%d, init_rate=%d\n", psta->qos_option, psta->htpriv.ht_option, psta->init_rate);        
-+                              seq_printf(m, "state=0x%x, aid=%d, macid=%d, raid=%d\n", psta->state, psta->aid, psta->mac_id, psta->raid);     
-+                              seq_printf(m, "bwmode=%d, ch_offset=%d, sgi=%d\n", psta->htpriv.bwmode, psta->htpriv.ch_offset, psta->htpriv.sgi);                                              
-+                              seq_printf(m, "ampdu_enable = %d\n", psta->htpriv.ampdu_enable);                                                                        
-+                              seq_printf(m, "agg_enable_bitmap=%x, candidate_tid_bitmap=%x\n", psta->htpriv.agg_enable_bitmap, psta->htpriv.candidate_tid_bitmap);
-+                              seq_printf(m, "sleepq_len=%d\n", psta->sleepq_len);
-+                              seq_printf(m, "capability=0x%x\n", psta->capability);
-+                              seq_printf(m, "flags=0x%x\n", psta->flags);
-+                              seq_printf(m, "wpa_psk=0x%x\n", psta->wpa_psk);
-+                              seq_printf(m, "wpa2_group_cipher=0x%x\n", psta->wpa2_group_cipher);
-+                              seq_printf(m, "wpa2_pairwise_cipher=0x%x\n", psta->wpa2_pairwise_cipher);
-+                              seq_printf(m, "qos_info=0x%x\n", psta->qos_info);
-+                              seq_printf(m, "dot118021XPrivacy=0x%x\n", psta->dot118021XPrivacy);
-+                                                              
-+                              for(j=0;j<16;j++)
-+                              {                                                       </