diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2007-10-16 15:32:17 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-10-16 15:32:17 +0000 |
| commit | b3ba903379bf59e915d425b1fb4a238b735e0b67 (patch) | |
| tree | 59d15780789fba988b75042daf02ed6eb112ef29 /packages | |
| parent | 8d3bc008d4f4389626d8ad4a13c4d80677f3b474 (diff) | |
| parent | cc98c523c185876133323707600c9cc2b004ad2d (diff) | |
merge of 'e6100a99008ef2edc3a6a765cfa14a1dad489cfb'
and 'fd6c3104412672124350e987af3ff8736304f817'
Diffstat (limited to 'packages')
| -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 |
3 files changed, 4 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}" |