diff options
32 files changed, 73 insertions, 243 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 90583b42a4..a295c144e7 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -470,7 +470,10 @@ do_deploy() { install -d ${DEPLOY_DIR_IMAGE} install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin + + if [ -d "${D}lib" ]; then tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE}.tgz -C ${D} lib + fi if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then if test -e arch/${ARCH}/boot/compressed/vmlinux ; then diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index b42f915bbb..381a6127aa 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -37,7 +37,7 @@ SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "641" SRCREV_pn-gnuradio ?= "6377" SRCREV_pn-gpe-contacts ?= "9312" -SRCREV_pn-gsm0710muxd ?= "193" +SRCREV_pn-gsm0710muxd ?= "263" SRCREV_pn-gtkhtml2 ?= "1158" SRCREV_pn-gypsy ?= "134" SRCREV_pn-hildon-1 ?= "14429" diff --git a/conf/machine/at32stk1000.conf b/conf/machine/at32stk1000.conf index 15e3c85ec5..13523ee1e5 100644 --- a/conf/machine/at32stk1000.conf +++ b/conf/machine/at32stk1000.conf @@ -22,8 +22,9 @@ ROOT_FLASH_SIZE = "8" EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536" KERNEL_IMAGETYPE = "uImage" -PREFERRED_VERSION_u-boot = "1.1.4" +PREFERRED_VERSION_u-boot = "1.3.2" +UBOOT_MACHINE = "atstk1002_config" UBOOT_ENTRYPOINT = "0x90000000" UBOOT_LOADADDRESS = "0x10000000" diff --git a/conf/machine/htckaiser.conf b/conf/machine/htckaiser.conf new file mode 100644 index 0000000000..ad17bb82bf --- /dev/null +++ b/conf/machine/htckaiser.conf @@ -0,0 +1,25 @@ +#@TYPE: Machine +#@NAME: HTC Kaiser phone +#@DESCRIPTION: Machine configuration for HTC Kaiser phone +TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" +XSERVER = "xserver-kdrive-fbdev" + +GUI_MACHINE_CLASS = "smallscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "240" +MACHINE_DISPLAY_HEIGHT_PIXELS = "320" + +TARGET_FPU = "soft" +TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s" +FEED_ARCH = "armv6" +PACKAGE_ARCH = "armv6" + + +IMAGE_FSTYPES ?= "tar.gz cpio.gz" + +PREFERRED_PROVIDER_virtual/kernel = "linux-kaiser" + +MACHINE_FEATURES = "kernel26 touchscreen screen keyboard" + diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf index 18678cc336..e041b34c6f 100644 --- a/conf/machine/om-gta02.conf +++ b/conf/machine/om-gta02.conf @@ -34,6 +34,7 @@ SERIAL_CONSOLE = "115200 ttySAC2" ROOT_FLASH_SIZE = "256" # extra jffs2 tweaks +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \ --no-cleanmarkers --pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \ --littleendian --pad \ @@ -45,7 +46,3 @@ EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native" # tune for S3C24x0 include conf/machine/include/tune-arm920t.inc - -# build YAFFS2 -IMAGE_FSTYPES ?= "jffs2 yaffs2" - diff --git a/contrib/mtn2git/update-script.example b/contrib/mtn2git/update-script.example index 3b23e19a49..7638cc2977 100644 --- a/contrib/mtn2git/update-script.example +++ b/contrib/mtn2git/update-script.example @@ -22,9 +22,9 @@ cd openembedded-git # Push all changes to the server, update the master tag as well -for branch in dev dreambox documentation oetest oz354x packaged-staging oz354fam083 angstrom-2007.12-stable entity stable; +for branch in `mtn --db ../../OE.mtn ls branches`; do - git-push --force git+ssh://ABC@repo.or.cz/srv/git/org.openembedded.dev.git org.openembedded.$branch; + git-push --force git+ssh://zecke2@repo.or.cz/srv/git/org.openembedded.dev.git $branch; done #dev is our master diff --git a/packages/gnuradio/gnuradio.inc b/packages/gnuradio/gnuradio.inc index 79b1fcefa5..ddf7c68eca 100644 --- a/packages/gnuradio/gnuradio.inc +++ b/packages/gnuradio/gnuradio.inc @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = " guile-native fftwf python libusb virtual/libsdl alsa-lib jack boost cppunit sdcc-native swig-native" -RDEPENDS_${PN} = "python-core python-audio python-codecs python-lang python-textutils" +RDEPENDS_${PN} = "python-core python-audio python-threading python-codecs python-lang python-textutils" RDEPENDS_gnuradio-usrp = "python-core" inherit autotools pkgconfig diff --git a/packages/gnuradio/gnuradio_3.0.4.bb b/packages/gnuradio/gnuradio_3.0.4.bb index 30a6d0ab5e..0474e0d5c2 100644 --- a/packages/gnuradio/gnuradio_3.0.4.bb +++ b/packages/gnuradio/gnuradio_3.0.4.bb @@ -1,6 +1,6 @@ require gnuradio.inc -PR = "r0" +PR = "r1" SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-${PV}.tar.gz \ file://no-trellis-doc.patch;patch=1 \ diff --git a/packages/gnuradio/gnuradio_3.1.2.bb b/packages/gnuradio/gnuradio_3.1.2.bb index 30a6d0ab5e..0474e0d5c2 100644 --- a/packages/gnuradio/gnuradio_3.1.2.bb +++ b/packages/gnuradio/gnuradio_3.1.2.bb @@ -1,6 +1,6 @@ require gnuradio.inc -PR = "r0" +PR = "r1" SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-${PV}.tar.gz \ file://no-trellis-doc.patch;patch=1 \ diff --git a/packages/gnuradio/gnuradio_svn.bb b/packages/gnuradio/gnuradio_svn.bb index 00d3a04056..e7ac492714 100644 --- a/packages/gnuradio/gnuradio_svn.bb +++ b/packages/gnuradio/gnuradio_svn.bb @@ -3,7 +3,7 @@ require gnuradio.inc DEFAULT_PREFERENCE = "-1" PV = "3.0.4+svnr${SRCREV}" -PR = "r2" +PR = "r3" SRC_URI = "svn://gnuradio.org/svn/gnuradio;module=trunk;proto=http \ file://no-trellis-doc.patch;patch=1 \ diff --git a/packages/images/unslung-image.bb b/packages/images/unslung-image.bb index cb2a20b75e..9ac4140a14 100644 --- a/packages/images/unslung-image.bb +++ b/packages/images/unslung-image.bb @@ -100,4 +100,12 @@ nslu2_pack_image () { -m ${STAGING_FIRMWARE_DIR}/NPE-B \ -t ${STAGING_LIBDIR}/nslu2-binaries/Trailer \ -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2.bin + slugimage -F -p \ + -b ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \ + -s ${STAGING_LIBDIR}/nslu2-binaries/SysConf \ + -k ${DEPLOY_DIR_IMAGE}/zImage-${MACHINE}.bin \ + -r Ramdisk:1,Flashdisk:${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + -m ${STAGING_FIRMWARE_DIR}/NPE-B \ + -t ${STAGING_LIBDIR}/nslu2-binaries/Trailer \ + -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2-16mb.bin } diff --git a/packages/linux/linux-kaiser_2.6.24+git.bb b/packages/linux/linux-kaiser_2.6.24+git.bb new file mode 100644 index 0000000000..ba4e6c1973 --- /dev/null +++ b/packages/linux/linux-kaiser_2.6.24+git.bb @@ -0,0 +1,15 @@ +require linux.inc + +PV = "2.6.24+git${SRCREV}" + +COMPATIBLE_MACHINE = "htckaiser" + +SRC_URI = "git://git.android.com/kernel.git;branch=android-msm;protocol=git \ + http://baliniak.pl/android/kernel.diff;patch=1" + +S = "${WORKDIR}/git" + +do_configure_prepend() { + cp .config ../defconfig +} + diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 5401237c49..526f49bd13 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r50" +PR = "r51" CONFLICTS = "db3" COMPATIBLE_MACHINE = "nslu2|ixp4xx" @@ -176,6 +176,7 @@ SLUGOS_PACKAGES = "\ openobex-apps \ openntpd \ openobex \ + openocd \ openssh \ openvpn \ patch \ @@ -216,6 +217,7 @@ SLUGOS_PACKAGES = "\ sudo \ sysfsutils \ tar \ + task-mokogateway-everything \ tcpdump \ thttpd \ tiff \ @@ -262,7 +264,6 @@ SLUGOS_BROKEN_PACKAGES = "\ pwc \ qc-usb-messenger \ syslog-ng \ - openocd task-mokogateway-everything \ task-native-sdk \ unionfs-modules unionfs-utils \ wview-sim-mysql wview-wxt510-mysql wview-vpro-mysql \ diff --git a/packages/openocd/openocd_svn.bb b/packages/openocd/openocd_svn.bb index 2815324521..d5c5ba05cd 100644 --- a/packages/openocd/openocd_svn.bb +++ b/packages/openocd/openocd_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Free and Open On-Chip Debugging, In-System Programming and Bounda HOMEPAGE = "http://openocd.berlios.de/" LICENSE = "GPL" PV = "0.0+r${SRCREV}" -PR = "r1" +PR = "r2" inherit autotools @@ -10,4 +10,5 @@ SRC_URI = "svn://svn.berlios.de/openocd;module=trunk \ file://openocd-link-static.patch;patch=1" S = "${WORKDIR}/trunk" +DEPENDS = "libftdi" EXTRA_OECONF = " --enable-ft2232_libftdi --disable-ftdi2232 --disable-ftd2xx" diff --git a/packages/rsync/rsync.inc b/packages/rsync/rsync.inc index bc24f4daac..7ec83293ff 100644 --- a/packages/rsync/rsync.inc +++ b/packages/rsync/rsync.inc @@ -7,6 +7,8 @@ DEPENDS += "popt" inherit autotools +SRC_URI = "http://rsync.samba.org/ftp/rsync/old-versions/rsync-${PV}.tar.gz" + EXTRA_OEMAKE='STRIP=""' do_install_append() { diff --git a/packages/rsync/rsync_2.6.9.bb b/packages/rsync/rsync_2.6.9.bb index 075dfa7b09..067df4f2f3 100644 --- a/packages/rsync/rsync_2.6.9.bb +++ b/packages/rsync/rsync_2.6.9.bb @@ -2,5 +2,4 @@ require rsync.inc PR = "r2" -SRC_URI = "http://rsync.samba.org/ftp/rsync/old-versions/rsync-${PV}.tar.gz \ - file://rsyncd.conf" +SRC_URI += "file://rsyncd.conf" diff --git a/packages/rsync/rsync_3.0.0.bb b/packages/rsync/rsync_3.0.0.bb index 720ef04521..99bec628d3 100644 --- a/packages/rsync/rsync_3.0.0.bb +++ b/packages/rsync/rsync_3.0.0.bb @@ -2,9 +2,10 @@ require rsync.inc PR = "r0" -SRC_URI = "http://rsync.samba.org/ftp/rsync/rsync-${PV}.tar.gz \ - file://m4.patch;patch=1 \ - file://rsyncd.conf" +SRC_URI += "\ + file://m4.patch;patch=1 \ + file://rsyncd.conf \ +" do_compile_prepend() { sed -i "s/conf_stop make_stop//" Makefile diff --git a/packages/wpa-supplicant/wpa-supplicant-nossl/.mtn2git_empty b/packages/wpa-supplicant/wpa-supplicant-nossl/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant-nossl/.mtn2git_empty +++ /dev/null diff --git a/packages/wpa-supplicant/wpa-supplicant-nossl/wpa-defconfig b/packages/wpa-supplicant/wpa-supplicant-nossl/wpa-defconfig deleted file mode 100644 index bf5d5e28e7..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant-nossl/wpa-defconfig +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_DRIVER_WEXT=y -CONFIG_WIRELESS_EXTENSION=y -CONFIG_DRIVER_HOSTAP=y - diff --git a/packages/wpa-supplicant/wpa-supplicant-nossl_0.2.6.bb b/packages/wpa-supplicant/wpa-supplicant-nossl_0.2.6.bb deleted file mode 100644 index fe1a30b58b..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant-nossl_0.2.6.bb +++ /dev/null @@ -1,7 +0,0 @@ -DESCRIPTION = "User space helper for WPA and WPA2 client operations. \ -The Supplicant is used in WPA/WPA2 key handshakes to authenticate \ -with the AP and to generate dynamic encryption keys (TKIP or CCMP)." - -PR = "r3" - -require wpa-supplicant_${PV}.inc diff --git a/packages/wpa-supplicant/wpa-supplicant-ssl/.mtn2git_empty b/packages/wpa-supplicant/wpa-supplicant-ssl/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant-ssl/.mtn2git_empty +++ /dev/null diff --git a/packages/wpa-supplicant/wpa-supplicant-ssl/wpa-defconfig b/packages/wpa-supplicant/wpa-supplicant-ssl/wpa-defconfig deleted file mode 100644 index 2dac008aa5..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant-ssl/wpa-defconfig +++ /dev/null @@ -1,15 +0,0 @@ -# CONFIG_DRIVER_HOSTAP is not set -CONFIG_DRIVER_WEXT=y -CONFIG_WIRELESS_EXTENSION=y -CONFIG_DRIVER_HOSTAP=y -CONFIG_IEEE8021X_EAPOL=y -CONFIG_EAP_MD5=y -CONFIG_MSCHAPV2=y -CONFIG_EAP_TLS=y -CONFIG_EAP_PEAP=y -CONFIG_EAP_TTLS=y -CONFIG_EAP_GTC=y -CONFIG_EAP_OTP=y -CONFIG_EAP_SIM=y -CONFIG_EAP_LEAP=y -#CONFIG_PCSC=y diff --git a/packages/wpa-supplicant/wpa-supplicant-ssl_0.2.6.bb b/packages/wpa-supplicant/wpa-supplicant-ssl_0.2.6.bb deleted file mode 100644 index 34f370a10e..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant-ssl_0.2.6.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "User space helper for WPA and WPA2 client operations with SSL. \ -The Supplicant is used in WPA/WPA2 key handshakes to authenticate \ -with the AP and to generate dynamic encryption keys (TKIP or CCMP)." -DEPENDSS = "openssl" -PR = "r3" - -EXTRA_OEMAKE="LIBS='-L${STAGING_LIBDIR} -lssl -lcrypto' LIBS_p='-L${STAGING_LIBDIR} -lssl -lcrypto'" - -require wpa-supplicant_${PV}.inc diff --git a/packages/wpa-supplicant/wpa-supplicant/.mtn2git_empty b/packages/wpa-supplicant/wpa-supplicant/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant/.mtn2git_empty +++ /dev/null diff --git a/packages/wpa-supplicant/wpa-supplicant/gnutlsfix.patch b/packages/wpa-supplicant/wpa-supplicant/gnutlsfix.patch deleted file mode 100644 index 795306bb35..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant/gnutlsfix.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: wpa_supplicant-0.5.5/tls_gnutls.c -=================================================================== ---- wpa_supplicant-0.5.5.orig/tls_gnutls.c 2006-06-25 03:05:07.000000000 +0200 -+++ wpa_supplicant-0.5.5/tls_gnutls.c 2006-10-29 15:12:21.000000000 +0100 -@@ -1029,8 +1029,13 @@ - const u8 *in_data, size_t in_len, - size_t *out_len) - { -+ u8 *appl_data; -+ size_t appl_data_len; -+ -+ appl_data = NULL; -+ - return tls_connection_handshake(ssl_ctx, conn, in_data, in_len, -- out_len); -+ out_len, appl_data, appl_data_len); - } - - diff --git a/packages/wpa-supplicant/wpa-supplicant_0.2.6.inc b/packages/wpa-supplicant/wpa-supplicant_0.2.6.inc deleted file mode 100644 index e75ce2e570..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant_0.2.6.inc +++ /dev/null @@ -1,33 +0,0 @@ -SECTION = "kernel/userland" -HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" -PRIORITY = "optional" -LICENSE = "GPL" - -SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ - file://wpa-defconfig \ - file://wpa_supplicant_default.conf" - -RREPLACES_${PN} = "hostap-${PN}" -RPROVIDES_${PN} = "hostap-${PN}" -RCONFLICTS_${PN} = "hostap-${PN}" - -S = "${WORKDIR}/wpa_supplicant-${PV}" - -do_compile() { - unset CFLAGS - base_do_compile -} - -do_configure() { - install -m 0644 ${WORKDIR}/wpa-defconfig .config -} - -do_install() { - install -d ${D}${sysconfdir} ${D}${bindir} - install -m 0644 wpa_supplicant.conf ${D}${sysconfdir}/wpa_supplicant.conf.sample - install -m 0644 ../wpa_supplicant_default.conf ${D}${sysconfdir}/wpa_supplicant.conf - install -m 0755 wpa_passphrase ${D}${bindir} - install -m 0755 wpa_cli ${D}${bindir} - install -m 0755 wpa_supplicant ${D}${bindir} -} - diff --git a/packages/wpa-supplicant/wpa-supplicant_0.3.6.bb b/packages/wpa-supplicant/wpa-supplicant_0.3.6.bb deleted file mode 100644 index 365bcb78cc..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant_0.3.6.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "A Client for Wi-Fi Protected Access (WPA)." -SECTION = "network" -LICENSE = "GPL" -HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" -DEPENDS = "openssl" -PR = "r3" - -SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-0.3.6.tar.gz \ - file://defconfig \ - file://driver-hermes.patch;patch=1 \ - file://wpa_supplicant.conf" -S = "${WORKDIR}/wpa_supplicant-${PV}" - -do_configure () { - install -m 0755 ${WORKDIR}/defconfig .config -} - -do_compile () { - make -} - -do_install () { - install -d ${D}${sbindir} - install -m755 wpa_supplicant ${D}${sbindir} - install -m755 wpa_passphrase ${D}${sbindir} - install -m755 wpa_cli ${D}${sbindir} - - install -d ${D}${sysconfdir} - install -m644 ${WORKDIR}/wpa_supplicant.conf ${D}${sysconfdir} - - install -d ${D}${docdir}/wpa_supplicant - install -m644 README ${D}${docdir}/wpa_supplicant -} diff --git a/packages/wpa-supplicant/wpa-supplicant_0.3.8.bb b/packages/wpa-supplicant/wpa-supplicant_0.3.8.bb deleted file mode 100644 index e11bcbc7cb..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant_0.3.8.bb +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION = "A Client for Wi-Fi Protected Access (WPA)." -SECTION = "network" -LICENSE = "GPL" -HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" -DEPENDS = "openssl" -DEPENDS_append_mtx-1 = " madwifi-modules" -DEPENDS_append_mtx-2 = " madwifi-modules" -PR = "r1" - -SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ - file://madwifi-bsd-fix.diff;patch=1;pnum=0 \ - file://defconfig \ - file://driver-hermes.patch;patch=1 \ - file://wpa_supplicant.conf" -S = "${WORKDIR}/wpa_supplicant-${PV}" - -do_configure () { - install -m 0755 ${WORKDIR}/defconfig .config -} - -do_compile () { - make -} - -do_install () { - install -d ${D}${sbindir} - install -m755 wpa_supplicant ${D}${sbindir} - install -m755 wpa_passphrase ${D}${sbindir} - install -m755 wpa_cli ${D}${sbindir} - - install -d ${D}${sysconfdir} - install -m644 ${WORKDIR}/wpa_supplicant.conf ${D}${sysconfdir} - - install -d ${D}${docdir}/wpa_supplicant - install -m644 README ${D}${docdir}/wpa_supplicant -} diff --git a/packages/wpa-supplicant/wpa-supplicant-0.5.inc b/packages/wpa-supplicant/wpa-supplicant_0.5.10.bb index b5e53e3f56..ccded27ffb 100644 --- a/packages/wpa-supplicant/wpa-supplicant-0.5.inc +++ b/packages/wpa-supplicant/wpa-supplicant_0.5.10.bb @@ -8,11 +8,8 @@ DEPENDS = "gnutls ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "", MY_ARCH := "${PACKAGE_ARCH}" PACKAGE_ARCH = "${@base_contains('COMBINED_FEATURES', 'pci', '${MACHINE_ARCH}', '${MY_ARCH}', d)}" -DEFAULT_PREFERENCE = "-2" - SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ file://defconfig-gnutls \ - file://gnutlsfix.patch;patch=1 \ file://ifupdown.sh \ file://functions.sh" diff --git a/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb b/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb deleted file mode 100644 index ce744b3fe7..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb +++ /dev/null @@ -1,3 +0,0 @@ -require wpa-supplicant-0.5.inc - -PR = "r3" diff --git a/packages/wpa-supplicant/wpa-supplicant_0.5.7.bb b/packages/wpa-supplicant/wpa-supplicant_0.5.7.bb deleted file mode 100644 index 2aa871bb74..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant_0.5.7.bb +++ /dev/null @@ -1,3 +0,0 @@ -require wpa-supplicant-0.5.inc - -PR = "r1"
\ No newline at end of file diff --git a/packages/wpa-supplicant/wpa-supplicant_cvs.bb b/packages/wpa-supplicant/wpa-supplicant_cvs.bb deleted file mode 100644 index db1395d76b..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant_cvs.bb +++ /dev/null @@ -1,58 +0,0 @@ -DESCRIPTION = "Client for Wi-Fi Protected Access (WPA)." -SECTION = "network" -LICENSE = "GPL" -HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" -DEPENDS = "openssl" -PV = "0.0+cvs${SRCDATE}" -PR = "r2" - -SRC_URI = "cvs://anonymous@hostap.epitest.fi/cvs;module=hostap \ - file://use-channel.patch;patch=1 \ - file://driver-hermes.patch;patch=1 \ - file://defconfig \ - file://defaults \ - file://init.sh \ - file://wpa_supplicant.conf" -S = "${WORKDIR}/hostap/wpa_supplicant" - - -PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli " -FILES_wpa-supplicant-passphrase = "/usr/sbin/wpa_passphrase" -FILES_wpa-supplicant-cli = "/usr/sbin/wpa_cli" - -RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli" - - -INITSCRIPT_NAME = "wpa" -INITSCRIPT_PARAMS = "defaults 10" -inherit update-rc.d - - -do_configure () { - install -m 0755 ${WORKDIR}/defconfig .config -} - - -do_compile () { - make -} - - -do_install () { - set -x - install -d ${D}${sbindir} - install -m755 wpa_supplicant ${D}${sbindir} - install -m755 wpa_passphrase ${D}${sbindir} - install -m755 wpa_cli ${D}${sbindir} - - install -d ${D}${localstatedir}/run/wpa_supplicant - - install -d ${D}${docdir}/wpa_supplicant - install -m644 README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant - - install -d ${D}${sysconfdir}/init.d - install -m700 ${WORKDIR}/init.sh ${D}${sysconfdir}/init.d/wpa - - install -d ${D}${sysconfdir}/default - install -m600 ${WORKDIR}/defaults ${D}${sysconfdir}/default/wpa -} |