summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/distro/familiar-unstable.conf6
-rw-r--r--conf/distro/familiar.conf9
-rw-r--r--packages/altboot/altboot_1.0.5.bb (renamed from packages/altboot/altboot_0.0.5.bb)4
-rw-r--r--packages/dropbear/dropbear.inc3
-rw-r--r--packages/dropbear/dropbear_0.45.bb2
-rw-r--r--packages/dropbear/dropbear_0.46.bb2
-rw-r--r--packages/dropbear/dropbear_0.47.bb2
-rw-r--r--packages/dropbear/dropbear_0.48.bb1
-rw-r--r--packages/linux/ep93xx-kernel/defconfig6
-rw-r--r--packages/linux/ep93xx-kernel_2.6.15+2.6.16-rc5.bb4
-rw-r--r--packages/neon/neon_0.24.7.bb14
11 files changed, 28 insertions, 25 deletions
diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf
index 1b5d6ba2bf..734d33db3c 100644
--- a/conf/distro/familiar-unstable.conf
+++ b/conf/distro/familiar-unstable.conf
@@ -43,9 +43,9 @@ PREFERRED_VERSION_orinoco-modules_ipaq-pxa270 ?= "0.15"
# The CSL compiler is unusable because
# 1) certain programs stop to compile
# 2) more programs segfault
-#PREFERRED_VERSION_gcc ?= "3.4.4"
-#PREFERRED_VERSION_gcc-cross ?= "3.4.4"
-#PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
+PREFERRED_VERSION_gcc ?= "3.4.4"
+PREFERRED_VERSION_gcc-cross ?= "3.4.4"
+PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
#
# Opie
diff --git a/conf/distro/familiar.conf b/conf/distro/familiar.conf
index 99e501589f..da5caa7998 100644
--- a/conf/distro/familiar.conf
+++ b/conf/distro/familiar.conf
@@ -2,14 +2,17 @@
#@NAME: Familiar Linux
#@DESCRIPTION: Distribution configuration for Familiar Linux (handhelds.org)
+MAINTAINER ?= "Familiar Developers <familiar-dev@handhelds.org>"
+
INHERIT += "package_ipk debian"
TARGET_OS = "linux"
-PARALLEL_INSTALL_MODULES = "1"
-UDEV_DEVFS_RULES = "1"
+BOOTSTRAP_EXTRA_RDEPENDS += "familiar-version"
IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}"
-BOOTSTRAP_EXTRA_RDEPENDS += "familiar-version"
+ENABLE_BINARY_LOCALE_GENERATION ?= "1"
+PARALLEL_INSTALL_MODULES = "1"
+UDEV_DEVFS_RULES = "1"
DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
diff --git a/packages/altboot/altboot_0.0.5.bb b/packages/altboot/altboot_1.0.5.bb
index 1cb51a3639..3c2a269b64 100644
--- a/packages/altboot/altboot_0.0.5.bb
+++ b/packages/altboot/altboot_1.0.5.bb
@@ -3,7 +3,7 @@
# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
#
-# Filename: altboot_0.0.5-rc2.bb
+# Filename: altboot_1.0.5-rc2.bb
# Date: 21-Feb-06
DESCRIPTION = "The altboot bootmanager"
@@ -22,6 +22,8 @@ TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}"
SRC_URI = "cvs://anonymous@hentges.net/hentgescvs;method=pserver;tag=${TAG};module=altboot"
+S = "${WORKDIR}/altboot/"
+
######################################################################################
do_install() {
diff --git a/packages/dropbear/dropbear.inc b/packages/dropbear/dropbear.inc
index fc3d3f8c9c..ec6433cfaf 100644
--- a/packages/dropbear/dropbear.inc
+++ b/packages/dropbear/dropbear.inc
@@ -26,7 +26,8 @@ BINCOMMANDS = "dbclient ssh scp"
EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"'
do_configure_prepend() {
- if [ "${DISTRO_TYPE}" == "debug" ]; then
+ if [ "x${DISTRO}" != "xfamiliar -a ""${DISTRO_TYPE}" == "debug" ]; then
+ oenote "WARNING: applying allow-nopw.patch which allows password-less logins!"
patch -p1 < ${WORKDIR}/allow-nopw.patch
fi
}
diff --git a/packages/dropbear/dropbear_0.45.bb b/packages/dropbear/dropbear_0.45.bb
index 8d94b370c1..68c6e87e75 100644
--- a/packages/dropbear/dropbear_0.45.bb
+++ b/packages/dropbear/dropbear_0.45.bb
@@ -1,5 +1,5 @@
require dropbear.inc
-PR = "r3"
+PR = "r4"
SRC_URI += "file://chansession-security-fix.patch;patch=1 "
diff --git a/packages/dropbear/dropbear_0.46.bb b/packages/dropbear/dropbear_0.46.bb
index 6a4815f07f..d34787fa64 100644
--- a/packages/dropbear/dropbear_0.46.bb
+++ b/packages/dropbear/dropbear_0.46.bb
@@ -1,5 +1,5 @@
require dropbear.inc
-PR = "r5"
+PR = "r6"
SRC_URI += "file://chansession-security-fix.patch;patch=1 "
diff --git a/packages/dropbear/dropbear_0.47.bb b/packages/dropbear/dropbear_0.47.bb
index 1b09c7ef92..b8467e1e7c 100644
--- a/packages/dropbear/dropbear_0.47.bb
+++ b/packages/dropbear/dropbear_0.47.bb
@@ -1,3 +1,3 @@
require dropbear.inc
-PR = "r1"
+PR = "r2"
diff --git a/packages/dropbear/dropbear_0.48.bb b/packages/dropbear/dropbear_0.48.bb
new file mode 100644
index 0000000000..f98c0ac8f6
--- /dev/null
+++ b/packages/dropbear/dropbear_0.48.bb
@@ -0,0 +1 @@
+require dropbear.inc
diff --git a/packages/linux/ep93xx-kernel/defconfig b/packages/linux/ep93xx-kernel/defconfig
index b89e7136dc..b655e9fd41 100644
--- a/packages/linux/ep93xx-kernel/defconfig
+++ b/packages/linux/ep93xx-kernel/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.16-rc5
-# Thu Mar 9 10:22:24 2006
+# Sat Mar 11 13:24:46 2006
#
CONFIG_ARM=y
CONFIG_MMU=y
@@ -447,6 +447,8 @@ CONFIG_BLK_DEV_SD=y
#
# CONFIG_ISCSI_TCP is not set
# CONFIG_SCSI_SATA is not set
+# CONFIG_SCSI_PATA_TS7200 is not set
+CONFIG_SCSI_PATA_EP93XX=m
# CONFIG_SCSI_DEBUG is not set
#
@@ -857,11 +859,11 @@ CONFIG_USB_EZUSB=y
# MMC/SD Card support
#
# CONFIG_MMC is not set
-CONFIG_RTC_LIB=y
#
# Real Time Clock
#
+CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_HCTOSYS=y
CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
diff --git a/packages/linux/ep93xx-kernel_2.6.15+2.6.16-rc5.bb b/packages/linux/ep93xx-kernel_2.6.15+2.6.16-rc5.bb
index 0e8de7e9a2..78630ccb9e 100644
--- a/packages/linux/ep93xx-kernel_2.6.15+2.6.16-rc5.bb
+++ b/packages/linux/ep93xx-kernel_2.6.15+2.6.16-rc5.bb
@@ -1,11 +1,11 @@
DESCRIPTION = "Linux Kernel for Cirrus Logic ep39xx compatible machines"
SECTION = "kernel"
LICENSE = "GPL"
-PR = "r11"
+PR = "r12"
SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \
http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.16-rc5.bz2;patch=1 \
- http://www.wantstofly.org/~buytenh/ep93xx/derevo14.diff;patch=1 \
+ http://www.wantstofly.org/~buytenh/ep93xx/derevo15.diff;patch=1 \
file://defconfig \
"
diff --git a/packages/neon/neon_0.24.7.bb b/packages/neon/neon_0.24.7.bb
index d53260b3cf..534b4d099d 100644
--- a/packages/neon/neon_0.24.7.bb
+++ b/packages/neon/neon_0.24.7.bb
@@ -1,24 +1,18 @@
DESCRIPTION = "neon is an HTTP and WebDAV client library, with a C interface."
SECTION = "base"
LICENSE = "LGPL"
-DEPENDS = "openssl zlib libxml2 expat time"
+DEPENDS = "zlib libxml2 expat time"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://www.webdav.org/neon/neon-0.24.7.tar.gz \
file://no-func-checks.patch;patch=1"
-inherit autotools lib_package
+inherit autotools binconfig lib_package
-EXTRA_OECONF = " --with-ssl --with-libxml2 --with-expat --enable-shared"
+EXTRA_OECONF = " --without-ssl --with-libxml2 --with-expat --enable-shared"
do_stage () {
autotools_stage_includes
oe_libinstall -C src -so -a libneon ${STAGING_LIBDIR}/
-
- cat neon-config | sed -e "s,^prefix=.*,prefix=${STAGING_BINDIR}/..," \
- -e "s,^exec_prefix=.*,exec_prefix=${STAGING_BINDIR}/..," \
- -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \
- -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR}/neon-config
- chmod a+rx ${STAGING_BINDIR}/neon-config
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-09 08:22:46 +0000