From 2b8fc10279a272acdb7a74ee0f258c71f7e81438 Mon Sep 17 00:00:00 2001 From: Martin Dietze Date: Mon, 25 Sep 2006 12:37:51 +0000 Subject: busybox: nylon no longer uses busybox-vi but elvis-tiny instead. --- packages/busybox/busybox-1.2.1/nylon/defconfig | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/busybox/busybox-1.2.1/nylon/defconfig b/packages/busybox/busybox-1.2.1/nylon/defconfig index 4d61408bf8..67c5408ada 100644 --- a/packages/busybox/busybox-1.2.1/nylon/defconfig +++ b/packages/busybox/busybox-1.2.1/nylon/defconfig @@ -257,17 +257,17 @@ CONFIG_FEATURE_AWK_MATH=y # CONFIG_ED is not set CONFIG_PATCH=y CONFIG_SED=y -CONFIG_VI=y -CONFIG_FEATURE_VI_COLON=y -CONFIG_FEATURE_VI_YANKMARK=y -CONFIG_FEATURE_VI_SEARCH=y -CONFIG_FEATURE_VI_USE_SIGNALS=y -CONFIG_FEATURE_VI_DOT_CMD=y -CONFIG_FEATURE_VI_READONLY=y -CONFIG_FEATURE_VI_SETOPTS=y -CONFIG_FEATURE_VI_SET=y -CONFIG_FEATURE_VI_WIN_RESIZE=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y +# CONFIG_VI is not set +#CONFIG_FEATURE_VI_COLON=y +#CONFIG_FEATURE_VI_YANKMARK=y +#CONFIG_FEATURE_VI_SEARCH=y +#CONFIG_FEATURE_VI_USE_SIGNALS=y +#CONFIG_FEATURE_VI_DOT_CMD=y +#CONFIG_FEATURE_VI_READONLY=y +#CONFIG_FEATURE_VI_SETOPTS=y +#CONFIG_FEATURE_VI_SET=y +#CONFIG_FEATURE_VI_WIN_RESIZE=y +#CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y # # Finding Utilities -- cgit v1.2.3 From 27f95188d694d3e0f4b30ec2c65df64f0b7ce63c Mon Sep 17 00:00:00 2001 From: Martin Dietze Date: Mon, 25 Sep 2006 12:39:26 +0000 Subject: wpa-supplicant, hostap: fixed wrong syntax for mtx-[12] conditional entries in recipes. --- packages/hostap/hostap-daemon.inc | 4 ++-- packages/wpa-supplicant/wpa-supplicant_0.3.8.bb | 4 ++-- packages/wpa-supplicant/wpa-supplicant_0.4.7.bb | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/hostap/hostap-daemon.inc b/packages/hostap/hostap-daemon.inc index a6e4a6246d..c095777446 100644 --- a/packages/hostap/hostap-daemon.inc +++ b/packages/hostap/hostap-daemon.inc @@ -6,8 +6,8 @@ MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "GPL" RDEPENDS = "hostap-modules hostap-utils (${PV})" DEPENDS = "openssl" -DEPENDS_mtx-1_append = "madwifi-modules" -DEPENDS_mtx-2_append = "madwifi-modules" +DEPENDS_append_mtx-1 = " madwifi-modules" +DEPENDS_append_mtx-2 = " madwifi-modules" CPPFLAGS_append_mtx-1 = " -I${STAGING_INCDIR}/madwifi/" CPPFLAGS_append_mtx-2 = " -I${STAGING_INCDIR}/madwifi/" diff --git a/packages/wpa-supplicant/wpa-supplicant_0.3.8.bb b/packages/wpa-supplicant/wpa-supplicant_0.3.8.bb index d125fb4027..a287e00eee 100644 --- a/packages/wpa-supplicant/wpa-supplicant_0.3.8.bb +++ b/packages/wpa-supplicant/wpa-supplicant_0.3.8.bb @@ -4,8 +4,8 @@ LICENSE = "GPL" MAINTAINER = "Holger Schurig" HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" DEPENDS = "openssl" -DEPENDS_mtx-1_append = "madwifi-modules" -DEPENDS_mtx-2_append = "madwifi-modules" +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 \ diff --git a/packages/wpa-supplicant/wpa-supplicant_0.4.7.bb b/packages/wpa-supplicant/wpa-supplicant_0.4.7.bb index bbb42879d9..ec7ca146d5 100644 --- a/packages/wpa-supplicant/wpa-supplicant_0.4.7.bb +++ b/packages/wpa-supplicant/wpa-supplicant_0.4.7.bb @@ -4,8 +4,8 @@ LICENSE = "GPL" MAINTAINER = "Holger Schurig" HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" DEPENDS = "openssl" -DEPENDS_mtx-1_append = "madwifi-modules" -DEPENDS_mtx-2_append = "madwifi-modules" +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 \ -- cgit v1.2.3 From 47d8546a56ecc27f248480ddbc3d6f17da6e9d39 Mon Sep 17 00:00:00 2001 From: Martin Dietze Date: Mon, 25 Sep 2006 12:40:48 +0000 Subject: nylon images and feed: use elvis-tiny as standard editor instead of busybox-vi. --- packages/images/nylon-image-base.bb | 2 +- packages/images/nylon-image-extended.bb | 3 ++- packages/images/nylon-image-standard.bb | 2 +- packages/meta/nylon-feed.inc | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/images/nylon-image-base.bb b/packages/images/nylon-image-base.bb index 4e7711e6c7..bcbcc67c05 100644 --- a/packages/images/nylon-image-base.bb +++ b/packages/images/nylon-image-base.bb @@ -11,7 +11,7 @@ NYLON_BASE = "base-files base-passwd bash busybox \ timezones tinylogin" DEPENDS += "virtual/kernel less nano" -RDEPENDS = "kernel modutils-depmod modutils-modinfo less nano \ +RDEPENDS = "kernel modutils-depmod modutils-modinfo less nano elvis-tiny \ ${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS}" export IPKG_INSTALL = "${RDEPENDS}" diff --git a/packages/images/nylon-image-extended.bb b/packages/images/nylon-image-extended.bb index 09ec4897f6..fc8c20ad30 100644 --- a/packages/images/nylon-image-extended.bb +++ b/packages/images/nylon-image-extended.bb @@ -76,7 +76,8 @@ KERNEL_MODULES = " \ DEPENDS += "${NYLON_EXTENDED_DEPENDS}" -RDEPENDS += "${NYLON_EXTENDED_DEPENDS} ${KERNEL_MODULES} ${NYLON_EXTENDED_RDEPENDS}" +RDEPENDS += "${NYLON_EXTENDED_DEPENDS} ${KERNEL_MODULES} \ + ${NYLON_EXTENDED_RDEPENDS} elvis-tools" RDEPENDS_append_mtx-1 = "\ kernel-module-au1x00-bi \ diff --git a/packages/images/nylon-image-standard.bb b/packages/images/nylon-image-standard.bb index c3c98ceca4..0fffbe0ff8 100644 --- a/packages/images/nylon-image-standard.bb +++ b/packages/images/nylon-image-standard.bb @@ -25,5 +25,5 @@ NYLON_STANDARD = "\ DEPENDS += "hostap-modules ntp \ ${NYLON_STANDARD}" -RDEPENDS += "hostap-modules-pci ntpdate \ +RDEPENDS += "hostap-modules-pci ntpdate nano elvis-tiny \ ${NYLON_STANDARD}" diff --git a/packages/meta/nylon-feed.inc b/packages/meta/nylon-feed.inc index 216cc0aeb6..1983bb7336 100644 --- a/packages/meta/nylon-feed.inc +++ b/packages/meta/nylon-feed.inc @@ -8,6 +8,7 @@ chillispot \ dash \ ddclient \ dnsmasq \ +elvis \ gdb \ gnupg \ hostap-modules \ -- cgit v1.2.3 From 850502975acacb2e93712898553aa6fdaa7c4ea3 Mon Sep 17 00:00:00 2001 From: Martin Dietze Date: Mon, 25 Sep 2006 12:42:32 +0000 Subject: nylon-scripts: upped SRCDATE as a more recent version is now used by nylon. --- packages/nylon/nylon-scripts_cvs.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nylon/nylon-scripts_cvs.bb b/packages/nylon/nylon-scripts_cvs.bb index e4917d310f..8be477bd7b 100644 --- a/packages/nylon/nylon-scripts_cvs.bb +++ b/packages/nylon/nylon-scripts_cvs.bb @@ -5,7 +5,7 @@ SECTION = "base" PRIORITY = "optional" MAINTAINER = "Bruno Randolf " LICENSE = "GPLv2" -SRCDATE = "20060114" +SRCDATE = "20060923" PV = "1.0.0+cvs${SRCDATE}" PR = "r2" RDEPENDS = "bash" -- cgit v1.2.3 From d2bb3d2a055ed2826468187b7373f981a6c10f97 Mon Sep 17 00:00:00 2001 From: Martin Dietze Date: Mon, 25 Sep 2006 12:43:14 +0000 Subject: elvis: added missing DEPENDS on ncurses. --- packages/elvis/elvis_2.2.0.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/elvis/elvis_2.2.0.bb b/packages/elvis/elvis_2.2.0.bb index 6f0f19fc39..cd460c3400 100644 --- a/packages/elvis/elvis_2.2.0.bb +++ b/packages/elvis/elvis_2.2.0.bb @@ -3,6 +3,7 @@ SECTION = "base" PRIORITY = "optional" MAINTAINER = "Martin Dietze " LICENSE = "Perl Clarified Artistic License" +DEPENDS = "ncurses" SRC_URI = "ftp://ftp.cs.pdx.edu/pub/elvis/elvis-2.2_0.tar.gz" S = "${WORKDIR}/elvis-2.2_0" -- cgit v1.2.3