From c4305172c7cfba564d1ad5d537724c9cdf23b530 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 6 Jan 2007 14:00:37 +0000 Subject: slugos-packages: demoted nfs-utils --- packages/meta/slugos-packages.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index cfe3613473..b3ea1beb77 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -140,7 +140,6 @@ SLUGOS_PACKAGES = "\ rng-tools \ rsync \ samba \ - sane-backends \ sed \ setpwc \ setserial \ @@ -165,7 +164,6 @@ SLUGOS_PACKAGES = "\ wget \ wireless-tools \ wpa-supplicant \ - zd1211 \ zip \ zlib \ " @@ -184,11 +182,13 @@ SLUGOS_BROKEN_PACKAGES = "\ obexftp \ puppy \ qc-usb-messenger \ + sane-backends \ unionfs-modules \ unionfs-utils \ cyrus-imapd \ lirc \ pwc \ + zd1211 \ " # These packages will never build because uclibc lacks (and always will lack) @@ -198,9 +198,9 @@ SLUGOS_BROKEN_PACKAGES = "\ # calls often still have 'yp' in the name). # NOTE: rng-tools is only here until argp-standalone can be built! + nfs-utils \ UCLIBC_UNSUPPORTABLE_PACKAGES = "\ libpam \ - nfs-utils \ rng-tools \ postfix \ yp-tools ypbind ypserv \ -- cgit v1.2.3 From dcf5a4027ada33cb3eb5946cc80bec86a1fbc069 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 6 Jan 2007 14:22:36 +0000 Subject: efika: remove pci from machine features to avoid troubles with building task-base --- conf/machine/efika.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/efika.conf b/conf/machine/efika.conf index 7c277d3d73..d564dc5654 100644 --- a/conf/machine/efika.conf +++ b/conf/machine/efika.conf @@ -6,7 +6,7 @@ TARGET_ARCH = "powerpc" PACKAGE_EXTRA_ARCHS = "ppc ppc603e" -MACHINE_FEATURES = "kernel26 usbhost ext2 pci alsa" +MACHINE_FEATURES = "kernel26 usbhost ext2 alsa" PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}" -- cgit v1.2.3 From 34a7b88ce2e625b4dab675dd7bf1c024ad5e7576 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 6 Jan 2007 15:26:29 +0000 Subject: angstrom 2007.1-oabi: tag packages as arm-oabi to minimize confusion --- conf/distro/angstrom-2007.1-oabi.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/distro/angstrom-2007.1-oabi.conf b/conf/distro/angstrom-2007.1-oabi.conf index d1541509c5..2c03702977 100644 --- a/conf/distro/angstrom-2007.1-oabi.conf +++ b/conf/distro/angstrom-2007.1-oabi.conf @@ -6,6 +6,9 @@ require conf/distro/angstrom-2007.1.conf #only glibc based builds are supported ATM TARGET_OS = "linux" +PACKAGE_ARCH = "arm-oabi" +PACKAGE_EXTRA_ARCHS = "arm-oabi" + FEED_ARCH_collie = "arm" FEED_ARCH_h3600 = "arm" FEED_ARCH_h3800 = "arm" -- cgit v1.2.3 From 61380d777ecb68a55fd070c3c98fd12a3dd37701 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Sat, 6 Jan 2007 15:30:56 +0000 Subject: wpa-supplicant: added 0.5.7, unified 0.5.x, added script to autostart wpa-supplicant on ifup --- .../wpa-supplicant-0.5.5/.mtn2git_empty | 0 .../wpa-supplicant-0.5.5/gnutlsfix.patch | 19 ------ packages/wpa-supplicant/wpa-supplicant-0.5.inc | 74 ++++++++++++++++++++++ .../wpa-supplicant/wpa-supplicant/.mtn2git_empty | 0 .../wpa-supplicant/wpa-supplicant/gnutlsfix.patch | 19 ++++++ packages/wpa-supplicant/wpa-supplicant_0.5.1.bb | 56 ---------------- packages/wpa-supplicant/wpa-supplicant_0.5.5.bb | 66 +------------------ packages/wpa-supplicant/wpa-supplicant_0.5.7.bb | 1 + 8 files changed, 96 insertions(+), 139 deletions(-) delete mode 100644 packages/wpa-supplicant/wpa-supplicant-0.5.5/.mtn2git_empty delete mode 100644 packages/wpa-supplicant/wpa-supplicant-0.5.5/gnutlsfix.patch create mode 100644 packages/wpa-supplicant/wpa-supplicant-0.5.inc create mode 100644 packages/wpa-supplicant/wpa-supplicant/.mtn2git_empty create mode 100644 packages/wpa-supplicant/wpa-supplicant/gnutlsfix.patch delete mode 100644 packages/wpa-supplicant/wpa-supplicant_0.5.1.bb create mode 100644 packages/wpa-supplicant/wpa-supplicant_0.5.7.bb diff --git a/packages/wpa-supplicant/wpa-supplicant-0.5.5/.mtn2git_empty b/packages/wpa-supplicant/wpa-supplicant-0.5.5/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/wpa-supplicant/wpa-supplicant-0.5.5/gnutlsfix.patch b/packages/wpa-supplicant/wpa-supplicant-0.5.5/gnutlsfix.patch deleted file mode 100644 index 795306bb35..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant-0.5.5/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.5.inc b/packages/wpa-supplicant/wpa-supplicant-0.5.inc new file mode 100644 index 0000000000..28f355c612 --- /dev/null +++ b/packages/wpa-supplicant/wpa-supplicant-0.5.inc @@ -0,0 +1,74 @@ +DESCRIPTION = "A Client for Wi-Fi Protected Access (WPA)." +SECTION = "network" +LICENSE = "GPL" +HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" +DEPENDS = "gnutls ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}" + +#we introduce MY_ARCH to get 'armv5te' as arch instead of the misleading 'arm' on armv5te builds +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://init.sh \ + file://gnutlsfix.patch;patch=1 \ + file://defaults-sane \ + file://wpa-supplicant.sh \ + file://wpa_supplicant.conf \ + file://wpa_supplicant.conf-sane" + +S = "${WORKDIR}/wpa_supplicant-${PV}" + +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 + +export HAS_PCI = "${@base_contains('COMBINED_FEATURES', 'pci', 1, 0,d)}" + +do_configure () { + install -m 0755 ${WORKDIR}/defconfig-gnutls .config + + if [ "x$HAS_PCI" == "x1" ] ; then + echo "CONFIG_DRIVER_MADWIFI=y" >> .config + echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config + fi +} + +do_compile () { + make +} + +do_install () { + install -d ${D}${sbindir} + install -m 755 wpa_supplicant ${D}${sbindir} + install -m 755 wpa_passphrase ${D}${sbindir} + install -m 755 wpa_cli ${D}${sbindir} + + install -d ${D}${localstatedir}/run/wpa_supplicant + + install -d ${D}${docdir}/wpa_supplicant + install -m 644 README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant + + install -d ${D}${sysconfdir}/init.d + install -m 700 ${WORKDIR}/init.sh ${D}${sysconfdir}/init.d/wpa + + install -d ${D}${sysconfdir}/default + install -m 600 ${WORKDIR}/defaults-sane ${D}${sysconfdir}/default/wpa + install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf + + install -d ${D}${sysconfdir}/network/if-pre-up.d/ + install -d ${D}${sysconfdir}/network/if-post-down.d/ + install -d ${D}${sysconfdir}/network/if-down.d/ + install -m 644 ${WORKDIR}/wpa_supplicant.conf ${D}${sysconfdir} + install -m 755 ${WORKDIR}/wpa-supplicant.sh ${D}${sysconfdir}/network/if-pre-up.d/wpa-supplicant + cd ${D}${sysconfdir}/network/ && \ + ln -sf ../if-pre-up.d/wpa-supplicant if-post-down.d/wpa-supplicant +} diff --git a/packages/wpa-supplicant/wpa-supplicant/.mtn2git_empty b/packages/wpa-supplicant/wpa-supplicant/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/wpa-supplicant/wpa-supplicant/gnutlsfix.patch b/packages/wpa-supplicant/wpa-supplicant/gnutlsfix.patch new file mode 100644 index 0000000000..795306bb35 --- /dev/null +++ b/packages/wpa-supplicant/wpa-supplicant/gnutlsfix.patch @@ -0,0 +1,19 @@ +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.5.1.bb b/packages/wpa-supplicant/wpa-supplicant_0.5.1.bb deleted file mode 100644 index 52eb62d848..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant_0.5.1.bb +++ /dev/null @@ -1,56 +0,0 @@ -DESCRIPTION = "A Client for Wi-Fi Protected Access (WPA)." -SECTION = "network" -LICENSE = "GPL" -HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" -DEPENDS = "gnutls madwifi-ng" - -PR = "r5" -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ - file://defconfig-gnutls \ - file://init.sh \ - file://defaults-sane \ - file://wpa_supplicant.conf \ - file://wpa_supplicant.conf-sane" - -S = "${WORKDIR}/wpa_supplicant-${PV}" - -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-gnutls .config - echo "CONFIG_DRIVER_MADWIFI=y" >> .config - echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config -} - -do_compile () { - make -} - -do_install () { - install -d ${D}${sbindir} - install -m 755 wpa_supplicant ${D}${sbindir} - install -m 755 wpa_passphrase ${D}${sbindir} - install -m 755 wpa_cli ${D}${sbindir} - - install -d ${D}${localstatedir}/run/wpa_supplicant - - install -d ${D}${docdir}/wpa_supplicant - install -m 644 README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant - - install -d ${D}${sysconfdir}/init.d - install -m 700 ${WORKDIR}/init.sh ${D}${sysconfdir}/init.d/wpa - - install -d ${D}${sysconfdir}/default - install -m 600 ${WORKDIR}/defaults-sane ${D}${sysconfdir}/default/wpa - install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf -} diff --git a/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb b/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb index 46ff13e3f0..67a5b99b0f 100644 --- a/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb +++ b/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb @@ -1,65 +1,3 @@ -DESCRIPTION = "A Client for Wi-Fi Protected Access (WPA)." -SECTION = "network" -LICENSE = "GPL" -HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" -DEPENDS = "gnutls ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}" +require wpa-supplicant-0.5.inc -#we introduce MY_ARCH to get 'armv5te' as arch instead of the misleading 'arm' on armv5te builds -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://init.sh \ - file://gnutlsfix.patch;patch=1 \ - file://defaults-sane \ - file://wpa_supplicant.conf \ - file://wpa_supplicant.conf-sane" - -S = "${WORKDIR}/wpa_supplicant-${PV}" - -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 - -export HAS_PCI = "${@base_contains('COMBINED_FEATURES', 'pci', 1, 0,d)}" - -do_configure () { - install -m 0755 ${WORKDIR}/defconfig-gnutls .config - - if [ "x$HAS_PCI" == "x1" ] ; then - echo "CONFIG_DRIVER_MADWIFI=y" >> .config - echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config - fi -} - -do_compile () { - make -} - -do_install () { - install -d ${D}${sbindir} - install -m 755 wpa_supplicant ${D}${sbindir} - install -m 755 wpa_passphrase ${D}${sbindir} - install -m 755 wpa_cli ${D}${sbindir} - - install -d ${D}${localstatedir}/run/wpa_supplicant - - install -d ${D}${docdir}/wpa_supplicant - install -m 644 README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant - - install -d ${D}${sysconfdir}/init.d - install -m 700 ${WORKDIR}/init.sh ${D}${sysconfdir}/init.d/wpa - - install -d ${D}${sysconfdir}/default - install -m 600 ${WORKDIR}/defaults-sane ${D}${sysconfdir}/default/wpa - install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf -} +PR = "r1" diff --git a/packages/wpa-supplicant/wpa-supplicant_0.5.7.bb b/packages/wpa-supplicant/wpa-supplicant_0.5.7.bb new file mode 100644 index 0000000000..6594bbfdbe --- /dev/null +++ b/packages/wpa-supplicant/wpa-supplicant_0.5.7.bb @@ -0,0 +1 @@ +require wpa-supplicant-0.5.inc -- cgit v1.2.3