summaryrefslogtreecommitdiff
path: root/busybox
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2004-09-29 16:03:54 +0000
committerMichael Lauer <mickey@vanille-media.de>2004-09-29 16:03:54 +0000
commite7accf1d04937aafeda19cf5575398465a7ccd5c (patch)
tree86a71fd37ec01c58e77d1a67e66daa151484a836 /busybox
parent69d94698c98150c9cc32ee8a14bc29b8ea3766c9 (diff)
Merge bk://openembedded@openembedded.bkbits.net/packages
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2004/09/29 18:03:23+02:00 uni-frankfurt.de!mickeyl konqueror and libqpe-opie: catch up with qt staging changes 2004/09/29 18:02:28+02:00 uni-frankfurt.de!mickeyl first bits for the qt2/qt3 split. Notes: a) qte2 is default, so no changes should be necessary for packages using the qmake or qmake-derived oeclasses. b) overriding QTDIR is no longer supported, remove that from your .oe files. c) manual changes for non-qmake packages can be necessary. d) inherit qt3x11 to configure qmake for Qt3/X11 (sic) 2004/09/29 17:58:32+02:00 uni-frankfurt.de!mickeyl fix section for mikmod and modplugplay 2004/09/29 17:12:08+02:00 uni-frankfurt.de!mickeyl enable losetup in default busybox config BKrev: 415adcea4UMfz2lvSSK4JcNs17Q9sQ
Diffstat (limited to 'busybox')
-rw-r--r--busybox/busybox-1.00-rc3/defconfig2
-rw-r--r--busybox/busybox_1.00-rc3.oe2
2 files changed, 2 insertions, 2 deletions
diff --git a/busybox/busybox-1.00-rc3/defconfig b/busybox/busybox-1.00-rc3/defconfig
index 5a206f42df..9deb97bcc3 100644
--- a/busybox/busybox-1.00-rc3/defconfig
+++ b/busybox/busybox-1.00-rc3/defconfig
@@ -451,7 +451,7 @@ CONFIG_FEATURE_MINIX2=y
CONFIG_HEXDUMP=y
CONFIG_HWCLOCK=y
CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y
-# CONFIG_LOSETUP is not set
+CONFIG_LOSETUP=y
CONFIG_MKSWAP=y
CONFIG_MORE=y
CONFIG_FEATURE_USE_TERMIOS=y
diff --git a/busybox/busybox_1.00-rc3.oe b/busybox/busybox_1.00-rc3.oe
index a0ba32284d..211717730f 100644
--- a/busybox/busybox_1.00-rc3.oe
+++ b/busybox/busybox_1.00-rc3.oe
@@ -11,7 +11,7 @@ HOMEPAGE = "http://www.busybox.net"
LICENSE = "GPL"
SECTION = "base"
PRIORITY = "required"
-PR = "r9"
+PR = "r10"
# file://busybox-1.00-pre10-fuser.patch;patch=1
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \