[oe-commits] org.oe.dev merge of '30ae730925a12988661810facbdca0b1b0399934'
mwester commit
oe at amethyst.openembedded.net
Mon Sep 1 18:22:11 UTC 2008
merge of '30ae730925a12988661810facbdca0b1b0399934'
and '704c652447ad25124b4af7103ee48137c5db36b2'
Author: mwester at openembedded.org
Branch: org.openembedded.dev
Revision: b276360ffd472780ff8a2ecb78b15b2b96691746
ViewMTN: http://monotone.openembedded.org/revision/info/b276360ffd472780ff8a2ecb78b15b2b96691746
Files:
1
packages/libgphoto2
packages/libgphoto2/libgphoto2_2.1.4.bb
packages/libgphoto2/libgphoto2_2.1.5.bb
packages/libgphoto2/libgphoto2_2.1.6.bb
packages/libgphoto2/libgphoto2_2.4.0.bb
packages/nonworking/libexif
packages/libexif
packages/u-boot/u-boot-git/akita
packages/u-boot/u-boot-git/c7x0
packages/u-boot/u-boot-git/spitz
packages/freetype/freetype-2.3.6/libtool-tag.patch
packages/u-boot/u-boot-git/akita/akita-standard-partitioning.patch
packages/u-boot/u-boot-git/c7x0/corgi-standard-partitioning.patch
packages/u-boot/u-boot-git/pdaXrom-u-boot.patch
packages/u-boot/u-boot-git/spitz/spitz-standard-partitioning.patch
packages/u-boot/u-boot-git/uboot-eabi-fix-HACK2.patch
packages/avahi/mango-lassi_git.bb
packages/freetype/freetype_2.3.6.bb
packages/gtk+/gtk+-native-1.2_1.2.10.bb
packages/images/fso-image.bb
packages/u-boot/u-boot_git.bb
packages/initscripts/initscripts-slugos_1.0.bb
packages/module-init-tools/module-init-tools-cross_3.2.2.bb
packages/module-init-tools/module-init-tools_3.2.2.bb
packages/slugos-init/files/boot/ram
packages/tasks/task-slugos.bb
packages/update-modules/update-modules_1.0.bb
Diffs:
#
# mt diff -r30ae730925a12988661810facbdca0b1b0399934 -rb276360ffd472780ff8a2ecb78b15b2b96691746
#
#
#
# delete "packages/libgphoto2"
#
# rename "packages/libgphoto2/libgphoto2_2.1.4.bb"
# to "packages/libgphoto2/libgphoto2_2.1.4.bb"
#
# rename "packages/libgphoto2/libgphoto2_2.1.5.bb"
# to "packages/libgphoto2/libgphoto2_2.1.5.bb"
#
# rename "packages/libgphoto2/libgphoto2_2.1.6.bb"
# to "packages/libgphoto2/libgphoto2_2.1.6.bb"
#
# rename "packages/libgphoto2/libgphoto2_2.4.0.bb"
# to "packages/libgphoto2/libgphoto2_2.4.0.bb"
#
# rename "packages/nonworking/libexif"
# to "packages/libexif"
#
# add_dir "packages/libgphoto2"
#
# add_dir "packages/u-boot/u-boot-git/akita"
#
# add_dir "packages/u-boot/u-boot-git/c7x0"
#
# add_dir "packages/u-boot/u-boot-git/spitz"
#
# add_file "packages/freetype/freetype-2.3.6/libtool-tag.patch"
# content [b8213e2cd332b83b78803115d4ad40f39c2aeed0]
#
# add_file "packages/u-boot/u-boot-git/akita/akita-standard-partitioning.patch"
# content [89c6e37a1fe4c184fb3c0f12c9f2d61805efcf2f]
#
# add_file "packages/u-boot/u-boot-git/c7x0/corgi-standard-partitioning.patch"
# content [d2fcc44d9d5927f0a9567d9e2bf51e6151db9554]
#
# add_file "packages/u-boot/u-boot-git/pdaXrom-u-boot.patch"
# content [25f5056ed787f2ab89dd930332129a706cd929dc]
#
# add_file "packages/u-boot/u-boot-git/spitz/spitz-standard-partitioning.patch"
# content [89c6e37a1fe4c184fb3c0f12c9f2d61805efcf2f]
#
# add_file "packages/u-boot/u-boot-git/uboot-eabi-fix-HACK2.patch"
# content [351c38da94c28ef6433e567e993489b821fb6563]
#
# patch "packages/avahi/mango-lassi_git.bb"
# from [3a59c1e0e88776b7c84accb2784335ec0f085416]
# to [0642c42c300edc7e3350d2d49809a0a6ed6fa2e3]
#
# patch "packages/freetype/freetype_2.3.6.bb"
# from [21f3efc48ae907a7f2b894a59accfeb216990350]
# to [a673fe4dbded2a5c55d88e9fa3b3b372938660f3]
#
# patch "packages/gtk+/gtk+-native-1.2_1.2.10.bb"
# from [b041f242c95f5b8f89067ec5adb29dd4a665ff2b]
# to [f92c0d8533d1a80f8c441cff58a48580266b8776]
#
# patch "packages/images/fso-image.bb"
# from [c8a13bba7a46ab4c7fb795f650086b0a34e45787]
# to [b03743a1d8090fd86b9bb6d4f566665d1e42a4b9]
#
# patch "packages/u-boot/u-boot_git.bb"
# from [dd5c9df20b550f8e184483944ba911d7de096d98]
# to [9a183fbf06fc4a6846788aae1a73a6c56bd68fa1]
#
============================================================
--- packages/freetype/freetype-2.3.6/libtool-tag.patch b8213e2cd332b83b78803115d4ad40f39c2aeed0
+++ packages/freetype/freetype-2.3.6/libtool-tag.patch b8213e2cd332b83b78803115d4ad40f39c2aeed0
@@ -0,0 +1,20 @@
+--- freetype-2.3.6/builds/unix/unix-cc.in
++++ freetype-2.3.6/builds/unix/unix-cc.in
+@@ -88,7 +88,7 @@
+ #
+ #
+ CCraw := $(CC)
+-CC := $(LIBTOOL) --mode=compile $(CCraw)
++CC := $(LIBTOOL) --tag=CC --mode=compile $(CCraw)
+
+ # Linker flags.
+ #
+@@ -105,7 +105,7 @@
+
+ # Library linking
+ #
+-LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
++LINK_LIBRARY = $(LIBTOOL) --tag=CC --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
+ -rpath $(libdir) -version-info $(version_info) \
+ $(LDFLAGS) -no-undefined \
+ # -export-symbols $(EXPORTS_LIST)
============================================================
--- packages/u-boot/u-boot-git/akita/akita-standard-partitioning.patch 89c6e37a1fe4c184fb3c0f12c9f2d61805efcf2f
+++ packages/u-boot/u-boot-git/akita/akita-standard-partitioning.patch 89c6e37a1fe4c184fb3c0f12c9f2d61805efcf2f
@@ -0,0 +1,56 @@
+--- git/include/configs/akita.h 2007-12-26 17:57:00.000000000 +0000
++++ git/include/configs/akita.h 2007-12-26 18:07:47.000000000 +0000
+@@ -81,35 +81,35 @@
+ "if testkey 101 ; " \
+ "then " \
+ "nand read.logical 0xa1000000 0x00060000 0x00540000; " \
+- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192; " \
++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192 mtdparts=sharpsl-nand-0:7168k(smf),ROOT_FLASH_SIZEM(root),-(home); " \
+ "bootm; " \
+ "fi; " \
+ "if testkey 2 ; " \
+ "then " \
+ "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \
+- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 fbcon=rotate:1; " \
++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 rootwait fbcon=rotate:1; " \
+ "bootm; " \
+ "fi; " \
+ "if testkey 18 ; " \
+ "then " \
+ "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \
+- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 fbcon=rotate:1; " \
++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 rootwait fbcon=rotate:1; " \
+ "bootm; " \
+ "fi; " \
+ "if testkey 3 ; " \
+ "then " \
+ "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \
+- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 fbcon=rotate:1; " \
++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 rootwait fbcon=rotate:1; " \
+ "bootm; " \
+ "fi; " \
+ "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \
+- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1; " \
++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1 mtdparts=sharpsl-nand-0:7168k(smf),ROOT_FLASH_SIZEM(root),-(home); " \
+ "bootm; "
+ #else
+ #define CONFIG_BOOTCOMMAND "" // "run boot_flash"
+ #endif
+
+-#define CONFIG_BOOTARGS "console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192"
++#define CONFIG_BOOTARGS "console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192 mtdparts=sharpsl-nand-0:7168k(smf),ROOT_FLASH_SIZEM(root),-(home)"
+ #define CONFIG_SETUP_MEMORY_TAGS 1
+ #define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
+ #define CONFIG_INITRD_TAG 1
+@@ -302,9 +302,9 @@
+ /* Note: fake mtd_id used, no linux mtd map file */
+
+ #define CONFIG_JFFS2_CMDLINE
+-#define MTDIDS_DEFAULT "nand0=laze-0"
++#define MTDIDS_DEFAULT "nand0=sharpsl-nand"
+ //#define MTDPARTS_DEFAULT "mtdparts=laze-0:256k(uboot),128k(env),-(jffs2)"
+-#define MTDPARTS_DEFAULT "mtdparts=laze-0:7168k(Logical),-(JFFS2)"
++#define MTDPARTS_DEFAULT "mtdparts=sharpsl-nand-0:7168k(smf),ROOT_FLASH_SIZEM(root),-(home)"
+
+ /*
+ * SHARP SL NAND logical partition
============================================================
--- packages/u-boot/u-boot-git/c7x0/corgi-standard-partitioning.patch d2fcc44d9d5927f0a9567d9e2bf51e6151db9554
+++ packages/u-boot/u-boot-git/c7x0/corgi-standard-partitioning.patch d2fcc44d9d5927f0a9567d9e2bf51e6151db9554
@@ -0,0 +1,56 @@
+--- git/include/configs/corgi.h 2007-12-26 17:57:00.000000000 +0000
++++ git/include/configs/corgi.h 2007-12-26 18:07:47.000000000 +0000
+@@ -81,35 +81,35 @@
+ "if testkey 101 ; " \
+ "then " \
+ "nand read.logical 0xa0800000 0x00060000 0x00540000; " \
+- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192; " \
++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192 mtdparts=sharpsl-nand:7168k(smf),ROOT_FLASH_SIZEM(root),-(home); " \
+ "bootm; " \
+ "fi; " \
+ "if testkey 2 ; " \
+ "then " \
+ "nand read.logical 0xa0800000 0x005a0000 0x00160000; " \
+- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1; " \
++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 rootwait; " \
+ "bootm; " \
+ "fi; " \
+ "if testkey 18 ; " \
+ "then " \
+ "nand read.logical 0xa0800000 0x005a0000 0x00160000; " \
+- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1; " \
++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 rootwait; " \
+ "bootm; " \
+ "fi; " \
+ "if testkey 3 ; " \
+ "then " \
+ "nand read.logical 0xa0800000 0x005a0000 0x00160000; " \
+- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1; " \
++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 rootwait; " \
+ "bootm; " \
+ "fi; " \
+ "nand read.logical 0xa0800000 0x005a0000 0x00160000; " \
+- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2; " \
++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 mtdparts=sharpsl-nand:7168k(smf),ROOT_FLASH_SIZEM(root),-(home); " \
+ "bootm; "
+ #else
+ #define CONFIG_BOOTCOMMAND "" // "run boot_flash"
+ #endif
+
+-#define CONFIG_BOOTARGS "console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192"
++#define CONFIG_BOOTARGS "console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192 mtdparts=sharpsl-nand:7168k(smf),ROOT_FLASH_SIZEM(root),-(home)"
+ #define CONFIG_SETUP_MEMORY_TAGS 1
+ #define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
+ #define CONFIG_INITRD_TAG 1
+@@ -304,9 +304,9 @@
+ /* Note: fake mtd_id used, no linux mtd map file */
+
+ #define CONFIG_JFFS2_CMDLINE
+-#define MTDIDS_DEFAULT "nand0=laze-0"
++#define MTDIDS_DEFAULT "nand0=sharpsl-nand"
+ //#define MTDPARTS_DEFAULT "mtdparts=laze-0:256k(uboot),128k(env),-(jffs2)"
+-#define MTDPARTS_DEFAULT "mtdparts=laze-0:7168k(Logical),-(JFFS2)"
++#define MTDPARTS_DEFAULT "mtdparts=sharpsl-nand:7168k(smf),ROOT_FLASH_SIZEM(root),-(home)"
+
+ /*
+ * SHARP SL NAND logical partition
============================================================
--- packages/u-boot/u-boot-git/pdaXrom-u-boot.patch 25f5056ed787f2ab89dd930332129a706cd929dc
+++ packages/u-boot/u-boot-git/pdaXrom-u-boot.patch 25f5056ed787f2ab89dd930332129a706cd929dc
@@ -0,0 +1,2467 @@
+diff -Nur u-boot-2006-04-18-1106/CREDITS u-boot-2006-04-18-1106-new/CREDITS
+--- u-boot-2006-04-18-1106/CREDITS 2006-04-18 09:05:03.000000000 +0000
++++ u-boot-2006-04-18-1106-new/CREDITS 2006-07-05 11:19:44.000000000 +0000
+@@ -93,6 +93,12 @@
+ E: jonathan.debruyne at siemens.atea.be
+ D: Port to Siemens IAD210 board
+
++N: Alexander Chukov
++E: sash at pdaXrom.org
++D: initial support for Sharp Zaurus SL-C1000/3100
++D: initial support for Sharp Zaurus SL-C7x0/C860
++W: http://www.pdaXrom.org
++
+ N: Ken Chou
+ E: kchou at ieee.org
+ D: Support for A3000 SBC board
+diff -Nur u-boot-2006-04-18-1106/MAINTAINERS u-boot-2006-04-18-1106-new/MAINTAINERS
+--- u-boot-2006-04-18-1106/MAINTAINERS 2006-04-18 09:05:03.000000000 +0000
++++ u-boot-2006-04-18-1106-new/MAINTAINERS 2006-07-05 11:19:44.000000000 +0000
+@@ -379,6 +379,11 @@
+
+ AT91RM9200DK at91rm9200
+
++Alexander Chukov <sash at pdaXrom.org>
++
++ akita xscale
++ corgi xscale
++
+ George G. Davis <gdavis at mvista.com>
+
+ assabet SA1100
+diff -Nur u-boot-2006-04-18-1106/MAKEALL u-boot-2006-04-18-1106-new/MAKEALL
+--- u-boot-2006-04-18-1106/MAKEALL 2006-04-18 09:05:03.000000000 +0000
++++ u-boot-2006-04-18-1106-new/MAKEALL 2006-07-05 11:19:44.000000000 +0000
+@@ -206,7 +206,7 @@
+ adsvix cerf250 cradle csb226 \
+ delta innokom lubbock pxa255_idp \
+ wepep250 xaeniax xm250 xsengine \
+- zylonite \
++ zylonite akita corgi \
+ "
+
+ LIST_ixp="ixdp425"
+diff -Nur u-boot-2006-04-18-1106/Makefile u-boot-2006-04-18-1106-new/Makefile
+--- u-boot-2006-04-18-1106/Makefile 2006-04-18 09:05:03.000000000 +0000
++++ u-boot-2006-04-18-1106-new/Makefile 2006-07-05 11:19:44.000000000 +0000
+@@ -61,7 +61,7 @@
+ CROSS_COMPILE = powerpc-linux-
+ endif
+ ifeq ($(ARCH),arm)
+-CROSS_COMPILE = arm-linux-
++CROSS_COMPILE = armv5tel-linux-
+ endif
+ ifeq ($(ARCH),i386)
+ ifeq ($(HOSTARCH),i386)
+@@ -1709,6 +1709,12 @@
+ zylonite_config :
+ @./mkconfig $(@:_config=) arm pxa zylonite
+
++akita_config : unconfig
++ @./mkconfig $(@:_config=) arm pxa akita
++
++corgi_config : unconfig
++ @./mkconfig $(@:_config=) arm pxa corgi
++
+ #########################################################################
+ ## ARM1136 Systems
+ #########################################################################
+diff -Nur u-boot-2006-04-18-1106/README u-boot-2006-04-18-1106-new/README
+--- u-boot-2006-04-18-1106/README 2006-04-18 09:05:03.000000000 +0000
++++ u-boot-2006-04-18-1106-new/README 2006-07-05 11:19:44.000000000 +0000
+@@ -311,7 +311,8 @@
+ CONFIG_KB9202, CONFIG_LART, CONFIG_LPD7A400,
+ CONFIG_LUBBOCK, CONFIG_OSK_OMAP5912, CONFIG_OMAP2420H4,
+ CONFIG_SHANNON, CONFIG_P2_OMAP730, CONFIG_SMDK2400,
+- CONFIG_SMDK2410, CONFIG_TRAB, CONFIG_VCMA9
++ CONFIG_SMDK2410, CONFIG_TRAB, CONFIG_VCMA9,
++ CONFIG_AKITA, CONFIG_CORGI
+
+ MicroBlaze based boards:
+ ------------------------
+diff -Nur u-boot-2006-04-18-1106/board/akita/Makefile u-boot-2006-04-18-1106-new/board/akita/Makefile
+--- u-boot-2006-04-18-1106/board/akita/Makefile 1970-01-01 00:00:00.000000000 +0000
++++ u-boot-2006-04-18-1106-new/board/akita/Makefile 2006-07-05 11:19:44.000000000 +0000
+@@ -0,0 +1,51 @@
++#
++# board/akita/Makefile
++#
++# (C) Copyright 2006 Alexander Chukov <sash at pdaXrom.org>
++#
++# (C) Copyright 2000
++# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
++#
++# See file CREDITS for list of people who contributed to this
++# project.
++#
++# This program is free software; you can redistribute it and/or
++# modify it under the terms of the GNU General Public License as
++# published by the Free Software Foundation; either version 2 of
++# the License, or (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++# MA 02111-1307 USA
++#
++
++include $(TOPDIR)/config.mk
++
++LIB = lib$(BOARD).a
++
++OBJS := akita.o nand.o kbd.o
++SOBJS := lowlevel_init.o
++
++$(LIB): $(OBJS) $(SOBJS)
++ $(AR) crv $@ $(OBJS) $(SOBJS)
++
++clean:
++ rm -f $(SOBJS) $(OBJS)
++
++distclean: clean
++ rm -f $(LIB) core *.bak .depend
++
++#########################################################################
++
++.depend: Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c)
++ $(CC) -M $(CPPFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@
++
++-include .depend
++
++#########################################################################
+diff -Nur u-boot-2006-04-18-1106/board/akita/akita.c u-boot-2006-04-18-1106-new/board/akita/akita.c
+--- u-boot-2006-04-18-1106/board/akita/akita.c 1970-01-01 00:00:00.000000000 +0000
++++ u-boot-2006-04-18-1106-new/board/akita/akita.c 2006-07-05 11:19:44.000000000 +0000
+@@ -0,0 +1,89 @@
++/*
++ * board/akita/akita.c
++ *
++ * Configuration settings for the Sharp Zaurus SL-Cxx00.
++ *
++ * (C) Copyright 2006 Alexander Chukov <sash at pdaXrom.org>
++ *
++ * portions from adsvix board configuration:
++ * (C) Copyright 2004
++ * Robert Whaley, Applied Data Systems, Inc. rwhaley at applieddata.net
++ * (C) Copyright 2002
++ * Kyle Harris, Nexus Technologies, Inc. kharris at nexus-tech.net
++ * (C) Copyright 2002
++ * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
++ * Marius Groeger <mgroeger at sysgo.de>
++ *
++ * See file CREDITS for list of people who contributed to this
++ * project.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Pla%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r704c652447ad25124b4af7103ee48137c5db36b2 -rb276360ffd472780ff8a2ecb78b15b2b96691746
#
#
#
# patch "packages/initscripts/initscripts-slugos_1.0.bb"
# from [5eb0daef896570641f9a484cf20496c3d0449536]
# to [b53ecc7ee0a048c71332f56fb4175bdb09913fc2]
#
# patch "packages/module-init-tools/module-init-tools-cross_3.2.2.bb"
# from [c9d7c86bbb96b9b13a6e4e70ad5a748284dff93a]
# to [403a83385ec40e5b70ece997280bfc617b0e9986]
#
# patch "packages/module-init-tools/module-init-tools_3.2.2.bb"
# from [920963b27f9d5c22fc6f8168443c5ed59b2dcd3c]
# to [d90ae96f8ebc510322f0e4fef9734348b427b40a]
#
# patch "packages/slugos-init/files/boot/ram"
# from [0196e2404034a031dd316f8be685fd7072e05d4a]
# to [6d95501a22c4d82ed70ec932d3f592ec7d6fce45]
#
# patch "packages/tasks/task-slugos.bb"
# from [fe69b335fe12d79a158040a4ad67ab291c6c5e87]
# to [3b4b6bd42f720b35aec589f38a0f20c8bc0b38a3]
#
# patch "packages/update-modules/update-modules_1.0.bb"
# from [ecad26ff3e4ce8d15f0e2e0c065189034d9a4eac]
# to [0af083cf5539038cf89aef22f7ab398448095010]
#
============================================================
--- packages/initscripts/initscripts-slugos_1.0.bb 5eb0daef896570641f9a484cf20496c3d0449536
+++ packages/initscripts/initscripts-slugos_1.0.bb b53ecc7ee0a048c71332f56fb4175bdb09913fc2
@@ -7,10 +7,16 @@ RCONFLICTS = "initscripts"
include initscripts_${PV}.bb
RCONFLICTS = "initscripts"
+
+# SlugOS uses the busybox makedevs, so until that dependency gets virtualized
+# the below lines serve to remove the dependency on the full makedevs package:
+DEPENDS = ""
+RDEPENDS = ""
+
# All other standard definitions inherited from initscripts
# Except the PR which is hacked here. The format used is
# a suffix
-PR := "${PR}.13"
+PR := "${PR}.14"
FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
============================================================
--- packages/module-init-tools/module-init-tools-cross_3.2.2.bb c9d7c86bbb96b9b13a6e4e70ad5a748284dff93a
+++ packages/module-init-tools/module-init-tools-cross_3.2.2.bb 403a83385ec40e5b70ece997280bfc617b0e9986
@@ -4,6 +4,10 @@ PROVIDES += "virtual/${TARGET_PREFIX}dep
DEFAULT_PREFERENCE = "0"
PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6"
+# Remove the RDEPENDS we picked up from the "require";
+# it's simply extraneous for the cross package
+RDEPENDS_${PN} = ""
+
EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}"
do_stage () {
============================================================
--- packages/module-init-tools/module-init-tools_3.2.2.bb 920963b27f9d5c22fc6f8168443c5ed59b2dcd3c
+++ packages/module-init-tools/module-init-tools_3.2.2.bb d90ae96f8ebc510322f0e4fef9734348b427b40a
@@ -3,7 +3,7 @@ SECTION = "base"
the same function that the modutils package serves for Linux 2.4."
LICENSE = "GPL"
SECTION = "base"
-PR = "r4"
+PR = "r5"
PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
RDEPENDS_${PN} += "module-init-tools-depmod"
============================================================
--- packages/slugos-init/files/boot/ram 0196e2404034a031dd316f8be685fd7072e05d4a
+++ packages/slugos-init/files/boot/ram 6d95501a22c4d82ed70ec932d3f592ec7d6fce45
@@ -28,9 +28,12 @@ then
# filter out boot (with zimage), linuxrc and anything
# below /var, keep dev or the boot will fail (note that
# nothing is mounted this early in the bootstrap).
- find . -mount -print |
+ find . -xdev -print |
sed '\@^./boot/@d;\@^./boot$@d;\@^./linuxrc at d;\@^./var/@d' |
cpio -p -d -m -u /mnt
+ # busybox find with -xdev will not print the name of the
+ # mountpoint, so create the empty dir manually if required.
+ test -d /mnt/mnt || mkdir /mnt/mnt
# checkmount checks for sh, init and no .recovery plus
# either mnt or initrd, mnt must exist!
if checkmount /mnt
============================================================
--- packages/tasks/task-slugos.bb fe69b335fe12d79a158040a4ad67ab291c6c5e87
+++ packages/tasks/task-slugos.bb 3b4b6bd42f720b35aec589f38a0f20c8bc0b38a3
@@ -6,7 +6,7 @@ LICENSE = "MIT"
DESCRIPTION = "Task packages for the SlugOS distribution"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r19"
+PR = "r20"
PACKAGE_ARCH = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
ALLOW_EMPTY = "1"
@@ -119,6 +119,8 @@ DISTRO_EXTRA_RDEPENDS ?= ""
DEPENDS += "${DISTRO_EXTRA_DEPENDS}"
DISTRO_EXTRA_RDEPENDS ?= ""
+
+## This comment block is temporary, to be removed once SlugOS 5.0 stabilizes
##RDEPENDS += "\
## kernel ixp4xx-npe \
## base-files base-passwd netbase \
@@ -138,13 +140,14 @@ DISTRO_EXTRA_RDEPENDS ?= ""
## util-linux-* utilities are now replaced by busybox tools. Also, ipkg
## is replaced by a trimmed-down version of opkg (no package signatures,
## and it uses the busybox wget command instead of libcurl - MJW
+## SlugOS 5.0 - module-init-tools replaced by busybox as well - MJW
RDEPENDS += "\
kernel ixp4xx-npe \
base-files base-passwd netbase \
busybox initscripts-slugos slugos-init \
update-modules sysvinit udev \
- module-init-tools modutils-initscripts \
+ modutils-initscripts \
opkg-collateral opkg-nogpg-nocurl \
libgcc \
beep \
============================================================
--- packages/update-modules/update-modules_1.0.bb ecad26ff3e4ce8d15f0e2e0c065189034d9a4eac
+++ packages/update-modules/update-modules_1.0.bb 0af083cf5539038cf89aef22f7ab398448095010
@@ -3,7 +3,7 @@ RDEPENDS = "${@base_contains("MACHINE_FE
LICENSE = "GPLv2"
PACKAGE_ARCH = "all"
RDEPENDS = "${@base_contains("MACHINE_FEATURES", "kernel26", "module-init-tools-depmod","modutils-depmod",d)} "
-PR = "r7"
+PR = "r8"
SRC_URI = "file://update-modules"
@@ -28,3 +28,10 @@ RDEPENDS_unslung = ""
# in both a 2.4 kernel distro and a 2.6 kernel distro. Really, it's
# not worth the effort to do that, so just overlook the next line.
RDEPENDS_unslung = ""
+
+# The SlugOS distro is testing the use of the busybox mod* utilities.
+# If that works out, we should create a virtual/update-modules, and
+# let the distros select if they want busybox, or some other package
+# to provide it. Until then, the following line just removes the
+# unwanted dependencies for SlugOS.
+RDEPENDS_slugos = ""
More information about the Openembedded-commits
mailing list