summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/distro/nylon.conf10
-rw-r--r--recipes/e2fsprogs-libs/e2fsprogs-libs.inc9
-rw-r--r--recipes/gcc/gcc-configure-common.inc1
-rw-r--r--recipes/linux/linux-mtx-1-2.4.27/49-bash4-configure.patch11
-rw-r--r--recipes/linux/linux-mtx-1_2.4.27.bb1
-rw-r--r--recipes/linux/linux-mtx-2-2.4.27/49-bash4-configure.patch11
-rw-r--r--recipes/linux/linux-mtx-2_2.4.27.bb1
-rw-r--r--recipes/mtd/mtd-utils.inc8
-rw-r--r--recipes/opkg/opkg-nogpg_svn.bb3
-rw-r--r--recipes/opkg/opkg_svn.bb2
10 files changed, 52 insertions, 5 deletions
diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf
index 99cab2bcbb..7ab7b35d20 100644
--- a/conf/distro/nylon.conf
+++ b/conf/distro/nylon.conf
@@ -62,12 +62,11 @@ PREFERRED_VERSION_glibc = "2.3.3"
PREFERRED_VERSION_glibc-initial = "2.3.2"
PREFERRED_VERSION_shorewall = "2.0.9-monolithic"
PREFERRED_VERSION_ppp-dsl = "0.1-monolithic"
-PREFERRED_VERSION_mtd-utils = "1.0.0+git"
+PREFERRED_VERSION_mtd-utils = "1.1.0"
PREFERRED_VERSION_kismet = "2005-01-R1"
-PREFERRED_VERSION_automake-native = "1.10"
+PREFERRED_VERSION_automake-native = "1.10.2"
PREFERRED_VERSION_pkgconfig-native = "0.23"
PREFERRED_VERSION_netperf = "2.3"
-PREFERRED_PROVIDER_hotplug = "linux-hotplug"
PREFERRED_VERSION_gcc-cross-initial = "3.3.4"
PREFERRED_VERSION_gcc-cross-intermediate = "3.3.4"
@@ -83,3 +82,8 @@ PREFERRED_VERSION_prism54-firmware = "1.0.3.0"
PREFERRED_VERSION_udev = "100"
PREFERRED_VERSION_madwifi-modules = "0.9.3"
PREFERRED_VERSION_madwifi-tools = "0.9.3"
+PREFERRED_VERSION_e2fsprogs-libs = "1.41.8"
+PREFERRED_VERSION_dbus = "1.2.1"
+
+PREFERRED_PROVIDER_hotplug = "linux-hotplug"
+PREFERRED_PROVIDER_opkg = "opkg-nogpg"
diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs.inc b/recipes/e2fsprogs-libs/e2fsprogs-libs.inc
index 45618b008c..f5e974b8aa 100644
--- a/recipes/e2fsprogs-libs/e2fsprogs-libs.inc
+++ b/recipes/e2fsprogs-libs/e2fsprogs-libs.inc
@@ -35,3 +35,12 @@ do_stage () {
install -m 0644 lib/ss/ss.h ${STAGING_INCDIR}/ss/
install -m 0644 lib/ss/ss_err.h ${STAGING_INCDIR}/ss/
}
+
+# avoid requiring unsupported util-linux-ng for nylon, provide uuid for others...
+DEPENDS_nylon = ""
+EXTRA_OECONF_nylon = ""
+do_stage_append_nylon() {
+ install -d ${STAGING_INCDIR}/uuid
+ install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/
+ install -m 0644 lib/uuid/libuuid.a ${STAGING_LIBDIR}/
+}
diff --git a/recipes/gcc/gcc-configure-common.inc b/recipes/gcc/gcc-configure-common.inc
index efe8ee8787..8a96326b7d 100644
--- a/recipes/gcc/gcc-configure-common.inc
+++ b/recipes/gcc/gcc-configure-common.inc
@@ -12,6 +12,7 @@ JAVA_sh3 ?= ""
OBJC_linux-uclibceabi ?= ""
OBJC_linux-uclibc ?= ""
OBJC_avr ?= ""
+OBJC_nylon ?= ""
OBJC ?= ",objc"
# gcc 3.x expects 'f77', 4.0 expects 'f95', 4.1 and 4.2 expect 'fortran'
diff --git a/recipes/linux/linux-mtx-1-2.4.27/49-bash4-configure.patch b/recipes/linux/linux-mtx-1-2.4.27/49-bash4-configure.patch
new file mode 100644
index 0000000000..222567d12e
--- /dev/null
+++ b/recipes/linux/linux-mtx-1-2.4.27/49-bash4-configure.patch
@@ -0,0 +1,11 @@
+--- linux/scripts/Configure-orig 2009-11-29 19:12:02.000000000 +0100
++++ linux/scripts/Configure 2009-11-29 19:12:27.000000000 +0100
+@@ -543,7 +543,7 @@
+ echo "#"
+ echo "# Using defaults found in" $DEFAULTS
+ echo "#"
+- . $DEFAULTS
++ . ./$DEFAULTS
+ sed -e 's/# \(CONFIG_[^ ]*\) is not.*/\1=n/' <$DEFAULTS >.config-is-not.$$
+ . .config-is-not.$$
+ rm .config-is-not.$$
diff --git a/recipes/linux/linux-mtx-1_2.4.27.bb b/recipes/linux/linux-mtx-1_2.4.27.bb
index 6dd7121bae..952edb0140 100644
--- a/recipes/linux/linux-mtx-1_2.4.27.bb
+++ b/recipes/linux/linux-mtx-1_2.4.27.bb
@@ -41,6 +41,7 @@ SRC_URI = "cvs://cvs:cvs@ftp.linux-mips.org/home/cvs;module=linux;tag=linux_2_4_
file://43-usbserial-27-32-backport.diff;patch=1 \
file://45-acm-tty-and-sb2.patch;patch=1 \
file://48-pptp.patch;patch=1 \
+ file://49-bash4-configure.patch;patch=1 \
file://defconfig-mtx-1"
S = "${WORKDIR}/linux"
diff --git a/recipes/linux/linux-mtx-2-2.4.27/49-bash4-configure.patch b/recipes/linux/linux-mtx-2-2.4.27/49-bash4-configure.patch
new file mode 100644
index 0000000000..222567d12e
--- /dev/null
+++ b/recipes/linux/linux-mtx-2-2.4.27/49-bash4-configure.patch
@@ -0,0 +1,11 @@
+--- linux/scripts/Configure-orig 2009-11-29 19:12:02.000000000 +0100
++++ linux/scripts/Configure 2009-11-29 19:12:27.000000000 +0100
+@@ -543,7 +543,7 @@
+ echo "#"
+ echo "# Using defaults found in" $DEFAULTS
+ echo "#"
+- . $DEFAULTS
++ . ./$DEFAULTS
+ sed -e 's/# \(CONFIG_[^ ]*\) is not.*/\1=n/' <$DEFAULTS >.config-is-not.$$
+ . .config-is-not.$$
+ rm .config-is-not.$$
diff --git a/recipes/linux/linux-mtx-2_2.4.27.bb b/recipes/linux/linux-mtx-2_2.4.27.bb
index 5b26903ec0..3379d548a1 100644
--- a/recipes/linux/linux-mtx-2_2.4.27.bb
+++ b/recipes/linux/linux-mtx-2_2.4.27.bb
@@ -43,6 +43,7 @@ SRC_URI += "cvs://cvs:cvs@ftp.linux-mips.org/home/cvs;module=linux;tag=linux_2_4
file://46-otg.patch;patch=1 \
file://47-au1000_eth.patch;patch=1 \
file://48-pptp.patch;patch=1 \
+ file://49-bash4-configure.patch;patch=1 \
file://defconfig-mtx-2"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-mtx-2-${PV}"
diff --git a/recipes/mtd/mtd-utils.inc b/recipes/mtd/mtd-utils.inc
index dcf0e7c832..813a09fb13 100644
--- a/recipes/mtd/mtd-utils.inc
+++ b/recipes/mtd/mtd-utils.inc
@@ -17,7 +17,9 @@ do_stage () {
install -m 0644 $f ${STAGING_INCDIR}/mtd/
done
for binary in ${mtd_utils}; do
- install -m 0755 $binary ${STAGING_BINDIR}
+ if [ -f $binary ]; then
+ install -m 0755 $binary ${STAGING_BINDIR}
+ fi
done
}
@@ -25,7 +27,9 @@ do_install () {
install -d ${D}${bindir}
install -d ${D}${includedir}/mtd
for binary in ${mtd_utils}; do
- install -m 0755 $binary ${D}${bindir}
+ if [ -f $binary ]; then
+ install -m 0755 $binary ${D}${bindir}
+ fi
done
for f in ${S}/include/mtd/*.h; do
install -m 0644 $f ${D}${includedir}/mtd
diff --git a/recipes/opkg/opkg-nogpg_svn.bb b/recipes/opkg/opkg-nogpg_svn.bb
index 9ddc589b49..33d9987463 100644
--- a/recipes/opkg/opkg-nogpg_svn.bb
+++ b/recipes/opkg/opkg-nogpg_svn.bb
@@ -20,5 +20,8 @@ LDFLAGS_append = " -Wl,--as-needed"
do_configure_prepend() {
sed -i -e s:-Werror::g ${S}/libopkg/Makefile.am
}
+do_configure_prepend_nylon() {
+ LDFLAGS="`echo "$LDFLAGS" | sed "s/ -Wl,--as-needed//"`"
+}
DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/opkg/opkg_svn.bb b/recipes/opkg/opkg_svn.bb
index 676a8cb499..57b2774b65 100644
--- a/recipes/opkg/opkg_svn.bb
+++ b/recipes/opkg/opkg_svn.bb
@@ -1,5 +1,7 @@
require opkg.inc
+DEPENDS_append = " openssl"
+
PR = "${INC_PR}"
PACKAGES =+ "libopkg-dev libopkg"
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-01 02:54:58 +0000