diff options
| -rw-r--r-- | packages/meta/slugos-packages.bb | 4 | ||||
| -rw-r--r-- | packages/uboot/files/makefile-no-dirafter.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/makefile-no-dirafter.patch) | 0 | ||||
| -rw-r--r-- | packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb | 1 | ||||
| -rw-r--r-- | packages/uicmoc/uicmoc4-native_4.3.1.bb | 1 |
4 files changed, 5 insertions, 1 deletions
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index e74fe9424c..7960be85eb 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r39" +PR = "r40" CONFLICTS = "db3" COMPATIBLE_MACHINE = "nslu2" @@ -50,6 +50,8 @@ SLUGOS_PACKAGES = "\ cron \ ctorrent \ ctrlproxy \ + cups \ + curl \ cvs \ cyrus-imapd \ cyrus-sasl \ diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/makefile-no-dirafter.patch b/packages/uboot/files/makefile-no-dirafter.patch index 2ed26c3127..2ed26c3127 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/makefile-no-dirafter.patch +++ b/packages/uboot/files/makefile-no-dirafter.patch diff --git a/packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb b/packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb index 2a09c76f09..1cee1edf37 100644 --- a/packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb +++ b/packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb @@ -19,6 +19,7 @@ SRC_URI = "\ svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;rev=${UBOOT_OPENMOKO_REV};proto=http \ file://uboot-eabi-fix-HACK.patch \ file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \ + file://makefile-no-dirafter.patch;patch=1 \ " EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" diff --git a/packages/uicmoc/uicmoc4-native_4.3.1.bb b/packages/uicmoc/uicmoc4-native_4.3.1.bb index d2ddec77e3..df39a494b2 100644 --- a/packages/uicmoc/uicmoc4-native_4.3.1.bb +++ b/packages/uicmoc/uicmoc4-native_4.3.1.bb @@ -26,6 +26,7 @@ EXTRA_OECONF = "-prefix ${STAGING_DIR}/${BUILD_SYS}/qt4 \ EXTRA_OEMAKE = " " do_configure() { + sed -i 's:^QT += xml qt3support$:QT += xml qt3support network:' "${S}"/src/tools/uic3/uic3.pro echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" } |