Author: titmuss
Date: Wed Sep 24 11:46:16 2008
New Revision: 2962
URL: http://svn.slimdevices.com?rev=2962&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r2948): bklaas | 2008-09-23 16:40:45 +0100
Bug: n/a
Description: add style to fix problem with top level menu layout
[EMAIL PROTECTED] (orig r2958): tom | 2008-09-24 16:05:11 +0100
removed unused dxguid.lib reference
[EMAIL PROTECTED] (orig r2959): titmuss | 2008-09-24 17:51:00 +0100
Bug: N/A
Description:
Make squeezeplay skin seperate packages, and pull in the correct skin for the
hardware
platform.
[EMAIL PROTECTED] (orig r2960): tom | 2008-09-24 18:53:30 +0100
Initial version (just untarred, no uder mods)
[EMAIL PROTECTED] (orig r2961): titmuss | 2008-09-24 19:41:52 +0100
Bug: N/A
Description:
Add rules to build ubi images with poky.
Update version of mtd-utils.
Support ubifs or jffs2 as the writable overlay filesystem.
Added:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/mtd/mtd-utils-native_1.2.0+git.bb
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/mtd/mtd-utils/ubinize_null_img.patch
7.4/trunk/squeezeplay/src/jpeg-6b/
7.4/trunk/squeezeplay/src/libpng-1.2.32/
Removed:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/mtd/mtd-utils/nandwrite_input_stdio.patch
Modified:
7.4/trunk/ (props changed)
7.4/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/linuxrc
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/libsdl/libsdl-image_svn.bb
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/mtd/mtd-utils/new-ubi-git.patch
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/mtd/mtd-utils_1.2.0+git.bb
7.4/trunk/squeezeplay/src/SDL-1.2.13/VisualC/SDL/SDL.vcproj
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
Propchange: 7.4/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Sep 24 11:46:16 2008
@@ -2,7 +2,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/branches/discovery-refactor:2596
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2920
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:2934
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:2961
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified: 7.4/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf?rev=2962&root=Jive&r1=2961&r2=2962&view=diff
==============================================================================
--- 7.4/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
(original)
+++ 7.4/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf Wed Sep
24 11:46:16 2008
@@ -16,6 +16,10 @@
CVS_TARBALL_STASH = ""
DISTRO_FEATURES = "alsa usbgadget usbhost wifi nfs zeroconf"
+
+# Add support for ubi images
+IMAGE_CMD_ubi = "echo -e ${IMAGE_UBI_CONFIG} > ${TMPDIR}/ubi.cfg && ubinize -o
${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi -m ${IMAGE_UBI_MIN_IO_SIZE} -p
${IMAGE_UBI_PEB_SIZE} -s ${IMAGE_UBI_SUB_PAGE_SIZE} ${EXTRA_IMAGECMD}
${TMPDIR}/ubi.cfg"
+IMAGE_DEPENDS_ubi = "mtd-utils-native"
# SqueezeOS/SqueezePlay SCM
SQUEEZEOS_SVN ?=
"svn://svn.slimdevices.com/repos/jive/${DISTRO_VERSION}/trunk/squeezeos/src/"
Modified:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/linuxrc
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/linuxrc?rev=2962&root=Jive&r1=2961&r2=2962&view=diff
==============================================================================
--- 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/linuxrc
(original)
+++ 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/linuxrc
Wed Sep 24 11:46:16 2008
@@ -13,22 +13,39 @@
echo /sbin/mdev > /proc/sys/kernel/hotplug
/sbin/mdev -s
-# Mount read/write filesystem
+# Mount read/write filesystem, we support ubifs or jffs2
+UBIFS_DEV=`grep ubifs /proc/mtd | cut -c4`
JFFS2_DEV=`grep jffs2 /proc/mtd | cut -c4`
-JFFS2_MTD=/dev/mtd/${JFFS2_DEV}
-JFFS2_MTDBLOCK=/dev/mtdblock/${JFFS2_DEV}
-/bin/mount -t jffs2 -o noatime ${JFFS2_MTDBLOCK} /mnt/storage
-JFFS2_OK=$?
+if [ ! -z $UBIFS_DEV ]
+then
+ # ubifs filesystem
+ MOUNT_TYPE=ubifs
+ MOUNT_MTD=/dev/mtd/${UBIFS_DEV}
+ MOUNT_DEVICE=ubi0:ubifs
+elif [ ! -z $JFFS2_DEV ]
+then
+ # jffs2 filesystem
+ MOUNT_TYPE=jffs2
+ MOUNT_MTD=/dev/mtd/${JFFS2_DEV}
+ MOUNT_DEVICE=/dev/mtdblock/${JFFS2_DEV}
+fi
+
+/bin/mount -t ${MOUNT_TYPE} -o noatime ${MOUNT_DEVICE} /mnt/storage
+MOUNT_OK=$?
# Factory reset
-if [ $JFFS2_OK -ne 0 -o -f /mnt/storage/.factoryreset ]
+if [ $MOUNT_OK -ne 0 -o -f /mnt/storage/.factoryreset ]
then
/bin/echo "Factory Reset"
/bin/umount /mnt/storage
- /usr/sbin/flash_eraseall -q ${JFFS2_MTD}
- /bin/mount -t jffs2 -o noatime ${JFFS2_MTDBLOCK} /mnt/storage
+ /usr/sbin/flash_eraseall -q ${MOUNT_MTD}
+ /bin/mount -t ${MOUNT_TYPE} -o noatime ${MOUNT_DEVICE} /mnt/storage
+
+ # Store version
+ /bin/mkdir -p /mnt/storage/etc
+ /bin/cp /etc/squeezeos.version /mnt/storage/etc/squeezeos.version
else
# Upgraded?
/usr/bin/diff -N /etc/squeezeos.version
/mnt/storage/etc/squeezeos.version > /dev/null 2> /dev/null
@@ -37,10 +54,13 @@
# Remove modified files
/bin/echo "SqueezeOS Upgraded"
/usr/bin/find /mnt/storage/ -type f | /bin/grep -v -f
/etc/keep-after-upgrade | /usr/bin/xargs /bin/rm -f
+
+ # Store version
+ /bin/mkdir -p /mnt/storage/etc
+ /bin/cp /etc/squeezeos.version
/mnt/storage/etc/squeezeos.version
fi
+fi
- cp /etc/squeezeos.version /mnt/storage/etc/squeezeos.version
-fi
# Mount overlay filesystem
/bin/mount -t mini_fo -o base=/,sto=/mnt/storage / /mnt/overlay
Modified:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb?rev=2962&root=Jive&r1=2961&r2=2962&view=diff
==============================================================================
---
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
(original)
+++
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
Wed Sep 24 11:46:16 2008
@@ -3,7 +3,7 @@
PRIORITY = "required"
LICENSE = "GPL"
-PR = "r12"
+PR = "r13"
SRC_URI = " \
file://config \
Modified:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/libsdl/libsdl-image_svn.bb
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/libsdl/libsdl-image_svn.bb?rev=2962&root=Jive&r1=2961&r2=2962&view=diff
==============================================================================
--- 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/libsdl/libsdl-image_svn.bb
(original)
+++ 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/libsdl/libsdl-image_svn.bb
Wed Sep 24 11:46:16 2008
@@ -5,7 +5,7 @@
BV = "1.2.5"
PV = "${BV}+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
SRC_URI="${SQUEEZEPLAY_SCM};module=SDL_image-${BV}"
@@ -18,7 +18,7 @@
inherit autotools
-EXTRA_OECONF = "--disable-tif"
+EXTRA_OECONF = "--disable-tif --disable-jpg-shared --disable-png-shared"
autotools_do_configure() {
${S}/autogen.sh
Added:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/mtd/mtd-utils-native_1.2.0+git.bb
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/mtd/mtd-utils-native_1.2.0%2Bgit.bb?rev=2962&root=Jive&view=auto
==============================================================================
---
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/mtd/mtd-utils-native_1.2.0+git.bb
(added)
+++
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/mtd/mtd-utils-native_1.2.0+git.bb
Wed Sep 24 11:46:16 2008
@@ -1,0 +1,19 @@
+require mtd-utils_${PV}.bb
+
+PR="r3"
+
+inherit native
+DEPENDS = "zlib-native lzo-native"
+FILESDIR = "[EMAIL PROTECTED](bb.data.getVar('FILE',d,1))}/mtd-utils"
+
+do_stage () {
+ install -d ${STAGING_INCDIR}/mtd
+ for f in ${S}/include/mtd/*.h; do
+ install -m 0644 $f ${STAGING_INCDIR}/mtd/
+ done
+ for binary in ${S}/ubi-utils/new-utils/${ubi_utils}; do
+ install -m 0755 $binary ${STAGING_BINDIR}
+ done
+}
+
+ubi_utils = "ubinize"
Modified:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/mtd/mtd-utils/new-ubi-git.patch
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/mtd/mtd-utils/new-ubi-git.patch?rev=2962&root=Jive&r1=2961&r2=2962&view=diff
==============================================================================
---
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/mtd/mtd-utils/new-ubi-git.patch
(original)
+++
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/mtd/mtd-utils/new-ubi-git.patch
Wed Sep 24 11:46:16 2008
@@ -2,27 +2,30 @@
===================================================================
--- git.orig/Makefile 2008-07-16 13:39:27.000000000 +0100
+++ git/Makefile 2008-07-16 13:49:31.000000000 +0100
-@@ -47,7 +47,7 @@
+@@ -47,8 +47,7 @@
.SUFFIXES:
all: $(TARGETS)
-- make -C $(BUILDDIR)/ubi-utils
-+ make -C $(BUILDDIR)/ubi-utils/new-utils
+- $(MAKE) -C $(BUILDDIR)/ubi-utils
+- $(MAKE) -C $(BUILDDIR)/mkfs.ubifs
++ $(MAKE) -C $(BUILDDIR)/ubi-utils/new-utils
IGNORE=${wildcard $(BUILDDIR)/.*.c.dep}
-include ${IGNORE}
-@@ -55,7 +55,7 @@
+@@ -56,8 +55,7 @@
clean:
rm -f $(BUILDDIR)/*.o $(TARGETS) $(BUILDDIR)/.*.c.dep $(SYMLINKS)
if [ "$(BUILDDIR)x" != ".x" ]; then rm -rf $(BUILDDIR); fi
-- make -C $(BUILDDIR)/ubi-utils clean
-+ make -C $(BUILDDIR)/ubi-utils/new-utils clean
+- $(MAKE) -C $(BUILDDIR)/ubi-utils clean
+- $(MAKE) -C $(BUILDDIR)/mkfs.ubifs clean
++ $(MAKE) -C $(BUILDDIR)/ubi-utils/new-utils clean
$(SYMLINKS):
ln -sf ../fs/jffs2/$@ $@
-@@ -97,4 +97,4 @@
+@@ -99,5 +97,4 @@
install -m0755 ${TARGETS} ${DESTDIR}/${SBINDIR}/
mkdir -p ${DESTDIR}/${MANDIR}/man1
gzip -9c mkfs.jffs2.1 > ${DESTDIR}/${MANDIR}/man1/mkfs.jffs2.1.gz
-- make -C $(BUILDDIR)/ubi-utils install
-+ make -C $(BUILDDIR)/ubi-utils/new-utils install
+- $(MAKE) -C $(BUILDDIR)/ubi-utils install
+- $(MAKE) -C $(BUILDDIR)/mkfs.ubifs install
++ $(MAKE) -C $(BUILDDIR)/ubi-utils/new-utils install
Added:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/mtd/mtd-utils/ubinize_null_img.patch
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/mtd/mtd-utils/ubinize_null_img.patch?rev=2962&root=Jive&view=auto
==============================================================================
---
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/mtd/mtd-utils/ubinize_null_img.patch
(added)
+++
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/mtd/mtd-utils/ubinize_null_img.patch
Wed Sep 24 11:46:16 2008
@@ -1,0 +1,39 @@
+--- mtd-utils.orig/ubi-utils/new-utils/src/ubinize.c 2008-09-23
21:10:28.000000000 +0100
++++ mtd-utils/ubi-utils/new-utils/src/ubinize.c 2008-09-23
20:54:37.000000000 +0100
+@@ -561,20 +561,22 @@
+ goto out_free;
+ }
+
+- fd = open(img, O_RDONLY);
+- if (fd == -1) {
+- sys_errmsg("cannot open \"%s\"", img);
+- goto out_free;
+- }
+-
+- verbose(args.verbose, "writing volume %d", vi[i].id);
+- verbose(args.verbose, "image file: %s", img);
+-
+- err = ubigen_write_volume(&ui, &vi[i], args.ec, st.st_size, fd,
args.out_fd);
+- close(fd);
+- if (err) {
+- errmsg("cannot write volume for section \"%s\"", sname);
+- goto out_free;
++ if (img) {
++ fd = open(img, O_RDONLY);
++ if (fd == -1) {
++ sys_errmsg("cannot open \"%s\"", img);
++ goto out_free;
++ }
++
++ verbose(args.verbose, "writing volume %d", vi[i].id);
++ verbose(args.verbose, "image file: %s", img);
++
++ err = ubigen_write_volume(&ui, &vi[i], args.ec,
st.st_size, fd, args.out_fd);
++ close(fd);
++ if (err) {
++ errmsg("cannot write volume for section
\"%s\"", sname);
++ goto out_free;
++ }
+ }
+
+ if (args.verbose)
Modified:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/mtd/mtd-utils_1.2.0+git.bb
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/mtd/mtd-utils_1.2.0%2Bgit.bb?rev=2962&root=Jive&r1=2961&r2=2962&view=diff
==============================================================================
--- 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/mtd/mtd-utils_1.2.0+git.bb
(original)
+++ 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/mtd/mtd-utils_1.2.0+git.bb
Wed Sep 24 11:46:16 2008
@@ -3,12 +3,12 @@
DEPENDS = "zlib lzo"
HOMEPAGE = "http://www.linux-mtd.infradead.org/";
LICENSE = "GPLv2"
-PR = "r2"
+PR = "r3"
-SRC_URI =
"git://git.infradead.org/mtd-utils.git;protocol=git;tag=487550498f70455f083cdc82b65442596fe7308e
\
+SRC_URI =
"git://git.infradead.org/mtd-utils.git;protocol=git;tag=41c53b6f2d756ae995c3ffa4455576515427c5e0
\
file://new-ubi-git.patch;patch=1 \
file://nanddump_skip_bad_blocks.patch;patch=1 \
- file://nandwrite_input_stdio.patch;patch=1"
+ file://ubinize_null_img.patch;patch=1"
S = "${WORKDIR}/git/"
Modified: 7.4/trunk/squeezeplay/src/SDL-1.2.13/VisualC/SDL/SDL.vcproj
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/SDL-1.2.13/VisualC/SDL/SDL.vcproj?rev=2962&root=Jive&r1=2961&r2=2962&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/SDL-1.2.13/VisualC/SDL/SDL.vcproj (original)
+++ 7.4/trunk/squeezeplay/src/SDL-1.2.13/VisualC/SDL/SDL.vcproj Wed Sep 24
11:46:16 2008
@@ -76,7 +76,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="winmm.lib dxguid.lib"
+ AdditionalDependencies="winmm.lib"
OutputFile="$(SolutionDir)$(ConfigurationName)/SDL.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -174,7 +174,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="winmm.lib dxguid.lib"
+ AdditionalDependencies="winmm.lib"
OutputFile="$(SolutionDir)$(ConfigurationName)/SDL.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified:
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua?rev=2962&root=Jive&r1=2961&r2=2962&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
Wed Sep 24 11:46:16 2008
@@ -377,6 +377,9 @@
s.menu.itemHeight = 72
s.menu.fg = {0xbb, 0xbb, 0xbb }
s.menu.font = _boldfont(400)
+
+ -- splitmenu in FullScreenSkin is a clone of menu
+ s.splitmenu = _uses(s.menu)
-- menu item
s.item = {}
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
