[oe-commits] org.oe.dev merge of '48e3d8ce0c21c80e6e929a3a992826251eed2f4d'
pfalcon commit
openembedded-commits at lists.openembedded.org
Sun Dec 2 18:08:33 UTC 2007
merge of '48e3d8ce0c21c80e6e929a3a992826251eed2f4d'
and 'd3dfa43eb653664a9ed9a5ae97b24949fee1c9cf'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 0162994bf697d58220a8bd4737ef32f1b71f463f
ViewMTN: http://monotone.openembedded.org/revision/info/0162994bf697d58220a8bd4737ef32f1b71f463f
Files:
1
packages/psplash/files/angstrom/angstrom-psplash-qvga-img.h
packages/psplash/files/angstrom/angstrom-psplash-vga-img.h
packages/dropbear/dropbear-early
packages/update-rc.d/files
contrib/angstrom/angstrom.png
packages/dropbear/dropbear-early/dropbear-early
packages/dropbear/dropbear-early_1.0.bb
packages/images/initramfs-bootmenu-image.bb
packages/ipkg/files/ipkg-configure
packages/psplash/files/logo-math.patch
packages/update-rc.d/files/add-verbose.patch
packages/xkbd/xkbd-0.8.15/differentiate-desktop-name.patch
contrib/angstrom/angstrom.svg
packages/ipkg/ipkg.inc
packages/ipkg/ipkg_0.99.163.bb
packages/psplash/files/angstrom/psplash-hand-img.h
packages/psplash/files/psplash-init
packages/psplash/psplash_svn.bb
packages/update-rc.d/update-rc.d_0.7.bb
packages/xkbd/xkbd_0.8.15.bb
mtn:manual_merge
true
packages/images/essential-image.bb
packages/images/essential-machine-image.bb
packages/libtool/libtool-1.5.10/tag1.patch
packages/pulseaudio/pulseaudio_0.9.7.bb
packages/flite/flite_1.2.bb
packages/flite/flite_1.3.bb
packages/flite/flite-1.3
packages/keymap-locales/files/qemux86
packages/keymaps/files/qemux86
classes/packaged-staging2.bbclass
packages/dtc/dtc-native_1.0.0.bb
packages/flite/flite-1.2/flite-1.2-alsa_support-1.2.diff
packages/flite/flite-1.3/flite-1.3-alsa_support-1.2.diff
packages/flite/flite.inc
packages/git/git-native_1.5.3.bb
packages/git/git.inc
packages/ipkg/files/ipkg_bugfix.patch
packages/keymap-locales/files/qemux86/keymap-extension-2.6-fr.map
packages/keymaps/files/qemux86/keymap-2.6.map
packages/libtool/libtool-1.5.10/libdir-la2.patch
packages/libtool/libtool-1.5.10/nmedit_fix.patch
packages/libtool/libtool-1.5.10/nousrlib.patch
packages/pulseaudio/pulseaudio_0.9.8.bb
site/arm-darwin
classes/base.bbclass
classes/cross.bbclass
classes/debian.bbclass
classes/package.bbclass
classes/siteinfo.bbclass
conf/bitbake.conf
conf/distro/angstrom-2007.1.conf
conf/distro/angstrom-2008.1.conf
conf/machine/include/ixp4xx.inc
packages/angstrom/angstrom-feed-configs.bb
packages/e2fsprogs/e2fsprogs-native_1.38.bb
packages/e2fsprogs/e2fsprogs.inc
packages/e2fsprogs/e2fsprogs_1.38.bb
packages/gcc/gcc-cross-initial_4.2.1.bb
packages/gcc/gcc-cross-initial_4.2.2.bb
packages/gcc/gcc-cross_4.2.1.bb
packages/gcc/gcc-cross_4.2.2.bb
packages/gtk+/gdk-pixbuf_2.10.14.bb
packages/images/nslu2-minimal-image.bb
packages/ipkg/ipkg-native_0.99.163.bb
packages/keymap-locales/keymap-locales.bb
packages/keymaps/keymaps_1.0.bb
packages/libtool/libtool-cross_1.5.10.bb
packages/libtool/libtool-native_1.5.10.bb
packages/libtool/libtool_1.5.10.bb
packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-rtc.patch
packages/linux/linux-ixp4xx/defconfig-2.6.21.6
packages/linux/linux-ixp4xx_2.6.21.6.bb
packages/linux/linux-ixp4xx_2.6.23.8.bb
packages/linux/linux_2.6.23.bb
packages/lyx/lyx_1.4.1.bb
packages/lyx/lyx_1.4.4.bb
packages/lyx/lyx_1.5.1.bb
packages/meta/meta-toolchain.bb
packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb
packages/pulseaudio/pulse.inc
packages/shasum/shasum-native.bb
packages/stage-manager/files/stage-manager
packages/stage-manager/stagemanager-native_0.0.1.bb
packages/tasks/task-base.bb
packages/tasks/task-boot.bb
packages/x11vnc/x11vnc_0.9.3.bb
site/common-glibc
Diffs:
#
# mt diff -r48e3d8ce0c21c80e6e929a3a992826251eed2f4d -r0162994bf697d58220a8bd4737ef32f1b71f463f
#
#
#
# delete "packages/psplash/files/angstrom/angstrom-psplash-qvga-img.h"
#
# delete "packages/psplash/files/angstrom/angstrom-psplash-vga-img.h"
#
# add_dir "packages/dropbear/dropbear-early"
#
# add_dir "packages/update-rc.d/files"
#
# add_file "contrib/angstrom/angstrom.png"
# content [9213fe50ab828fe0492d8c97cfdaf90e1c6c15cd]
#
# add_file "packages/dropbear/dropbear-early/dropbear-early"
# content [e2408ee87210f48cc8b47a8f34b5bb1bf49cdba6]
#
# add_file "packages/dropbear/dropbear-early_1.0.bb"
# content [cdaf892564086415c02630de43886143350b375b]
#
# add_file "packages/images/initramfs-bootmenu-image.bb"
# content [8f1db3a032593d55326052d8031210f27d4194a9]
#
# add_file "packages/ipkg/files/ipkg-configure"
# content [38012e0e1b7b0690b187e43e83c2e33fbc0bc9e8]
#
# add_file "packages/psplash/files/logo-math.patch"
# content [3863c6539054b0633895cdd79f7940fde4987c4f]
#
# add_file "packages/update-rc.d/files/add-verbose.patch"
# content [048e2e241d96d7bbd0f1a8a75440348719c9a168]
#
# add_file "packages/xkbd/xkbd-0.8.15/differentiate-desktop-name.patch"
# content [5b3f1a05266b9f5386bba4d560d28692b8d75e45]
#
# patch "contrib/angstrom/angstrom.svg"
# from [b5659f7c38dc54dcc4ad153de0e5afa5ccefc00f]
# to [447e9be910fbd6667c31c1b301ee9896fd5e0b96]
#
# patch "packages/ipkg/ipkg.inc"
# from [d30b7883173e0c568eca20df33d213945f55d864]
# to [fc113df6d214da7a33273c7512dac5215da76f90]
#
# patch "packages/ipkg/ipkg_0.99.163.bb"
# from [eb539f2d4afc5f5d3617816a1d41afb6953cd070]
# to [3a58f561fcf234def5a100e624f4c721f8694641]
#
# patch "packages/psplash/files/angstrom/psplash-hand-img.h"
# from [01b8752ff29f7c525a80ea6b1a8d4bad2b5df6b5]
# to [577b452f887a9b23c1d553da6633798490f07e95]
#
# patch "packages/psplash/files/psplash-init"
# from [3772ad3a62a548c557d719d87d586d1d4ea6044f]
# to [920674c4b9876275351f49712ab0fa731a6ca7a9]
#
# patch "packages/psplash/psplash_svn.bb"
# from [4614b6fa0d17df94d33a6949963375bf587e08e7]
# to [5f388d9f92a2d8c405d7d667d3c6c45c288c82bb]
#
# patch "packages/update-rc.d/update-rc.d_0.7.bb"
# from [28b3abe47b31ca41c3a409d73fa6383056db6bf2]
# to [db8c8fda3527ff9f206b916648f803b0b9f08adb]
#
# patch "packages/xkbd/xkbd_0.8.15.bb"
# from [9013b4a317fe2b993dc22cd9fae92e3e670c0939]
# to [087f363f1700e269f80d882f9ef70135bee264d9]
#
# set "contrib/angstrom/angstrom.png"
# attr "mtn:manual_merge"
# value "true"
#
============================================================
# contrib/angstrom/angstrom.png is binary
============================================================
--- packages/dropbear/dropbear-early/dropbear-early e2408ee87210f48cc8b47a8f34b5bb1bf49cdba6
+++ packages/dropbear/dropbear-early/dropbear-early e2408ee87210f48cc8b47a8f34b5bb1bf49cdba6
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+for x in $(cat /proc/cmdline); do
+ case $x in
+ dropbear=early)
+ echo "Starting dropbear early"
+ exec /etc/init.d/dropbear $*
+ ;;
+ esac
+done
============================================================
--- packages/dropbear/dropbear-early_1.0.bb cdaf892564086415c02630de43886143350b375b
+++ packages/dropbear/dropbear-early_1.0.bb cdaf892564086415c02630de43886143350b375b
@@ -0,0 +1,17 @@
+DESCRIPTION = "Allow to start dropbear soon after boot, depending on kernel command line option."
+SECTION = "devel"
+PR = "r1"
+
+SRC_URI = "file://dropbear-early"
+
+inherit update-rc.d
+
+do_install() {
+ install -d ${D}${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/${INITSCRIPT_NAME} ${D}${sysconfdir}/init.d/
+}
+
+PACKAGE_ARCH = "all"
+
+INITSCRIPT_NAME = "dropbear-early"
+INITSCRIPT_PARAMS = "start 00 S ."
============================================================
--- packages/images/initramfs-bootmenu-image.bb 8f1db3a032593d55326052d8031210f27d4194a9
+++ packages/images/initramfs-bootmenu-image.bb 8f1db3a032593d55326052d8031210f27d4194a9
@@ -0,0 +1,11 @@
+# Sample initramfs image
+
+IMAGE_INSTALL = "busybox-static initramfs-module-bootmenu"
+IMAGE_LINGUAS = ""
+
+# Remove any kernel-image that the kernel-module-* packages may have pulled in.
+PACKAGE_REMOVE = "kernel-image-* update-modules module-init-tools-depmod uclibc update-rc.d"
+ROOTFS_POSTPROCESS_COMMAND += "ipkg-cl ${IPKG_ARGS} -force-depends \
+ remove ${PACKAGE_REMOVE};"
+
+inherit image
============================================================
--- packages/ipkg/files/ipkg-configure 38012e0e1b7b0690b187e43e83c2e33fbc0bc9e8
+++ packages/ipkg/files/ipkg-configure 38012e0e1b7b0690b187e43e83c2e33fbc0bc9e8
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+echo "Starting to configure packages..."
+ipkg-cl configure
+echo "Finished to configure packages."
============================================================
--- packages/psplash/files/logo-math.patch 3863c6539054b0633895cdd79f7940fde4987c4f
+++ packages/psplash/files/logo-math.patch 3863c6539054b0633895cdd79f7940fde4987c4f
@@ -0,0 +1,13 @@
+Do better math when showing logo vs progressbar.
+
+--- psplash/psplash.c.org 2007-09-22 20:33:36.000000000 +0300
++++ psplash/psplash.c 2007-12-01 21:27:08.000000000 +0200
+@@ -258,7 +258,7 @@
+ /* Draw the OH logo */
+ psplash_fb_draw_image (fb,
+ (fb->width - HAND_IMG_WIDTH)/2,
+- (fb->height - HAND_IMG_HEIGHT)/2,
++ ((fb->height * 5) / 6 - HAND_IMG_HEIGHT)/2,
+ HAND_IMG_WIDTH,
+ HAND_IMG_HEIGHT,
+ HAND_IMG_BYTES_PER_PIXEL,
============================================================
--- packages/update-rc.d/files/add-verbose.patch 048e2e241d96d7bbd0f1a8a75440348719c9a168
+++ packages/update-rc.d/files/add-verbose.patch 048e2e241d96d7bbd0f1a8a75440348719c9a168
@@ -0,0 +1,47 @@
+--- update-rc.d/update-rc.d.org 2005-01-03 00:30:47.000000000 +0200
++++ update-rc.d/update-rc.d 2007-12-01 19:41:08.000000000 +0200
+@@ -19,6 +19,7 @@
+ notreally=0
+ force=0
+ dostart=0
++verbose=0
+
+ usage()
+ {
+@@ -28,6 +29,7 @@
+ update-rc.d [-n] [-r <root>] [-s] <basename> start|stop NN runlvl [runlvl] [...] .
+ -n: not really
+ -f: force
++ -v: verbose
+ -r: alternate root path (default is /)
+ -s: invoke start methods if appropriate to current runlevel
+ EOF
+@@ -69,7 +71,7 @@
+ lev=`echo $2 | cut -d/ -f1`
+ nn=`echo $2 | cut -d/ -f2`
+ fn="${etcd}${lev}.d/${startstop}${nn}${bn}"
+- echo " $fn -> ../init.d/$bn"
++ [ $verbose -eq 1 ] && echo " $fn -> ../init.d/$bn"
+ if [ $notreally -eq 0 ]; then
+ mkdir -p `dirname $fn`
+ ln -s ../init.d/$bn $fn
+@@ -89,7 +91,7 @@
+ exit 0
+ fi
+
+- echo " Adding system startup for $initd/$bn ..."
++ echo " Adding system startup for $initd/$bn."
+
+ for i in $startlinks; do
+ dolink S $i
+@@ -105,6 +107,10 @@
+ shift
+ continue
+ ;;
++ -v) verbose=1
++ shift
++ continue
++ ;;
+ -f) force=1
+ shift
+ continue
============================================================
--- packages/xkbd/xkbd-0.8.15/differentiate-desktop-name.patch 5b3f1a05266b9f5386bba4d560d28692b8d75e45
+++ packages/xkbd/xkbd-0.8.15/differentiate-desktop-name.patch 5b3f1a05266b9f5386bba4d560d28692b8d75e45
@@ -0,0 +1,12 @@
+diff -r 1eb4100bbe39 xkbd.desktop
+--- a/xkbd.desktop Wed Nov 28 02:14:35 2007 +0200
++++ b/xkbd.desktop Wed Nov 28 02:15:01 2007 +0200
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+-Name=Keyboard
+-Comment=Virtual Keyboard
++Name=Ol' Good Keyboard
++Comment=xkbd the Virtual Keyboard
+ Exec=xkbd
+ Type=Application
+ Icon=xkbd.png
============================================================
--- contrib/angstrom/angstrom.svg b5659f7c38dc54dcc4ad153de0e5afa5ccefc00f
+++ contrib/angstrom/angstrom.svg 447e9be910fbd6667c31c1b301ee9896fd5e0b96
@@ -12,18 +12,19 @@
height="300"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.44.1"
+ inkscape:version="0.45.1"
version="1.0"
- sodipodi:docbase="/mnt/MultimediaA"
- sodipodi:docname="passer.svg"
+ sodipodi:docbase="/home/pfalcon/linux-ppc/org.openembedded.dev/contrib/angstrom"
+ sodipodi:docname="angstrom.svg"
inkscape:export-filename="/mnt/MultimediaA/passer_s.png"
inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
+ inkscape:export-ydpi="90"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
- pagecolor="#dbe3e2"
+ pagecolor="#ecece1"
bordercolor="#666666"
borderopacity="1.0"
gridtolerance="10000"
@@ -33,7 +34,7 @@
inkscape:pageshadow="2"
inkscape:zoom="0.5"
inkscape:cx="305.99401"
- inkscape:cy="190.18075"
+ inkscape:cy="-129.81925"
inkscape:document-units="px"
inkscape:current-layer="layer2"
width="300px"
@@ -46,9 +47,9 @@
gridoriginy="0px"
gridoriginx="0px"
inkscape:window-width="1590"
- inkscape:window-height="1122"
+ inkscape:window-height="961"
inkscape:window-x="0"
- inkscape:window-y="24"
+ inkscape:window-y="0"
inkscape:object-points="true" />
<metadata
id="metadata7">
@@ -123,7 +124,10 @@
rx="11.246277" />
<g
id="g1927"
- transform="matrix(2.146701,0,0,2.146701,-398.0853,376.2692)">
+ transform="matrix(2.146701,0,0,2.146701,-398.0853,376.2692)"
+ inkscape:export-filename="/home/pfalcon/linux-ppc/org.openembedded.dev/contrib/angstrom/angstrom.png"
+ inkscape:export-xdpi="95.910004"
+ inkscape:export-ydpi="95.910004">
<text
transform="matrix(0,-1,1,0,0,0)"
sodipodi:linespacing="100%"
@@ -143,7 +147,10 @@
</g>
<g
id="g1936"
- transform="matrix(2.052686,0,0,2.052686,-404.4489,380.2516)">
+ transform="matrix(2.052686,0,0,2.052686,-404.4489,380.2516)"
+ inkscape:export-filename="/home/pfalcon/linux-ppc/org.openembedded.dev/contrib/angstrom/angstrom.png"
+ inkscape:export-xdpi="95.910004"
+ inkscape:export-ydpi="95.910004">
<path
sodipodi:nodetypes="cc"
id="path1938"
============================================================
--- packages/ipkg/ipkg.inc d30b7883173e0c568eca20df33d213945f55d864
+++ packages/ipkg/ipkg.inc fc113df6d214da7a33273c7512dac5215da76f90
@@ -10,28 +10,24 @@ SRC_URI = "${HANDHELDS_CVS};module=famil
AUTO_LIBNAME_PKGS = "libipkg"
SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+ file://ipkg-configure \
file://terse.patch;patch=1"
S = "${WORKDIR}/ipkg/C"
-inherit autotools pkgconfig
+inherit autotools pkgconfig update-rc.d
# Define a variable to allow distros to run configure earlier.
# (for example, to enable loading of ethernet kernel modules before networking starts)
IPKG_INIT_POSITION = "98"
IPKG_INIT_POSITION_slugos = "41"
+INITSCRIPT_NAME = "ipkg-configure"
+INITSCRIPT_PARAMS = "start ${IPKG_INIT_POSITION} S ."
+
+
pkg_postinst_ipkg () {
#!/bin/sh
-if [ "x$D" != "x" ]; then
- install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
- # this happens at S98 where our good 'ole packages script used to run
- echo "#!/bin/sh
-ipkg-cl configure
-" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${IPKG_INIT_POSITION}configure
- chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${IPKG_INIT_POSITION}configure
-fi
-
update-alternatives --install ${bindir}/ipkg ipkg ${bindir}/ipkg-cl 100
}
@@ -40,6 +36,11 @@ update-alternatives --remove ipkg ${bind
update-alternatives --remove ipkg ${bindir}/ipkg-cl
}
+do_install_append() {
+ install -d ${D}${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/${INITSCRIPT_NAME} ${D}${sysconfdir}/init.d/
+}
+
do_stage() {
oe_libinstall -so libipkg ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}/replace/
============================================================
--- packages/ipkg/ipkg_0.99.163.bb eb539f2d4afc5f5d3617816a1d41afb6953cd070
+++ packages/ipkg/ipkg_0.99.163.bb 3a58f561fcf234def5a100e624f4c721f8694641
@@ -1,9 +1,10 @@ include ipkg.inc
include ipkg.inc
-PR = "r5"
+PR = "r6"
S = "${WORKDIR}/ipkg-${PV}"
SRC_URI = "http://www.handhelds.org/pub/packages/ipkg/ipkg-${PV}.tar.gz \
+ file://ipkg-configure \
file://terse.patch;patch=1 \
file://is-processing.patch;patch=1 \
file://1-pkg-parse--Optimize-inefficient-parsing.patch;patch=1 \
============================================================
--- packages/psplash/files/angstrom/psplash-hand-img.h 01b8752ff29f7c525a80ea6b1a8d4bad2b5df6b5
+++ packages/psplash/files/angstrom/psplash-hand-img.h 577b452f887a9b23c1d553da6633798490f07e95
@@ -1,1336 +1,1454 @@
/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */
-#define HAND_IMG_ROWSTRIDE (1016)
-#define HAND_IMG_WIDTH (254)
-#define HAND_IMG_HEIGHT (264)
+#define HAND_IMG_ROWSTRIDE (920)
+#define HAND_IMG_WIDTH (230)
+#define HAND_IMG_HEIGHT (231)
#define HAND_IMG_BYTES_PER_PIXEL (4) /* 3:RGB, 4:RGBA */
#define HAND_IMG_RLE_PIXEL_DATA ((uint8*) \
- "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343" \
- "\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377" \
- "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333" \
- "\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342" \
- "\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377" \
- "\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343" \
- "\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377" \
- "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333" \
- "\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342" \
- "\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377" \
- "\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343" \
- "\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377" \
- "\377\333\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333" \
- "\343\342\377\377\333\343\342\377\377\333\343\342\377\377\333\343\342" \
- "\377\377\333\343\342\377\377\333\343\342\377\331\333\343\342\377\5\327" \
- "\340\337\377\314\327\325\377\306\323\320\377\321\333\331\377\332\342" \
- "\341\377\377\333\343\342\377\206\333\343\342\377\1\276\311\307\377\202" \
- "g~y\377\357\333\343\342\377\2\253\276\272\377\233\262\255\377\204\223" \
- "\254\247\377\3\225\255\250\377\240\266\262\377\303\321\316\377\377\333" \
- "\343\342\377\204\333\343\342\377\1\270\305\303\377\202Slg\377\357\333" \
- "\343\342\377\11\231\260\254\377\223\254\247\377\243\271\264\377\267\307" \
- "\304\377\277\316\313\377\256\301\275\377\232\261\255\377\223\254\247" \
- "\377\271\311\306\377\377\333\343\342\377\204\333\343\342\377\1\270\305" \
- "\303\377\202Slg\377\357\333\343\342\377\202\231\260\254\377\204\377\377" \
- "\377\377\3\326\337\335\377\223\254\247\377\271\311\306\377\364\333\343" \
- "\342\377\4\332\342\341\377\316\330\326\377\277\312\310\377\260\275\273" \
- "\377\213\254\271\267\377\1\225\246\243\377\202Slg\377\357\333\343\342" \
- "\377\202\231\260\254\377\204\377\377\377\377\3\326\337\335\377\223\254" \
- "\247\377\271\311\306\377\362\333\343\342\377\3\266\302\300\377v\212\206" \
- "\377Vni\377\221Slg\377\357\333\343\342\377\202\231\260\254\377\204\377" \
- "\377\377\377\3\326\337\335\377\223\254\247\377\271\311\306\377\360\333" \
- "\343\342\377\2\320\331\330\377n\204\200\377\224Slg\377\357\333\343\342" \
- "\377\202\231\260\254\377\204\377\377\377\377\3\326\337\335\377\223\254" \
- "\247\377\271\311\306\377\357\333\343\342\377\2\332\342\341\377x\215\211" \
- "\377\225Slg\377\357\333\343\342\377\202\231\260\254\377\204\377\377\377" \
- "\377\3\326\337\335\377\223\254\247\377\271\311\306\377\357\333\343\342" \
- "\377\1\240\260\255\377\204Slg\377\4Uni\377s\210\203\377\177\222\217\377" \
- "\213\235\231\377\213\222\243\240\377\1\202\225\221\377\202Slg\377\357" \
- "\333\343\342\377\202\231\260\254\377\204\377\377\377\377\3\326\337\335" \
- "\377\223\254\247\377\271\311\306\377\357\333\343\342\377\1{\217\213\377" \
- "\203Slg\377\2\230\250\245\377\317\330\327\377\216\333\343\342\377\1\270" \
- "\305\303\377\202Slg\377\357\333\343\342\377\202\231\260\254\377\204\377" \
- "\377\377\377\3\326\337\335\377\223\254\247\377\271\311\306\377\357\333" \
- "\343\342\377\1byt\377\202Slg\377\1\230\250\245\377\220\333\343\342\377" \
- "\1\270\305\303\377\202Slg\377\357\333\343\342\377\202\231\260\254\377" \
- "\204\377\377\377\377\3\326\3%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rd3dfa43eb653664a9ed9a5ae97b24949fee1c9cf -r0162994bf697d58220a8bd4737ef32f1b71f463f
#
#
#
# delete "packages/images/essential-image.bb"
#
# delete "packages/images/essential-machine-image.bb"
#
# delete "packages/libtool/libtool-1.5.10/tag1.patch"
#
# delete "packages/pulseaudio/pulseaudio_0.9.7.bb"
#
# rename "packages/flite/flite_1.2.bb"
# to "packages/flite/flite_1.3.bb"
#
# add_dir "packages/flite/flite-1.3"
#
# add_dir "packages/keymap-locales/files/qemux86"
#
# add_dir "packages/keymaps/files/qemux86"
#
# add_file "classes/packaged-staging2.bbclass"
# content [59a91d125afea47071a318c45a9942ffd3d8111b]
#
# add_file "packages/dtc/dtc-native_1.0.0.bb"
# content [a6cfb4d12568399421737e9db3bec79674a9c14a]
#
# add_file "packages/flite/flite-1.2/flite-1.2-alsa_support-1.2.diff"
# content [1323b9a20a5ae18f6e810e3bfd2f87deba1fac32]
#
# add_file "packages/flite/flite-1.3/flite-1.3-alsa_support-1.2.diff"
# content [a6996dbf165f003c1ed309b24fffdc611695c242]
#
# add_file "packages/flite/flite.inc"
# content [85bb5fbc859a7afa126494a7ae04c8024d9e2dd7]
#
# add_file "packages/flite/flite_1.2.bb"
# content [e32b2aed362684c9c359d98839bc237d62603eef]
#
# add_file "packages/git/git-native_1.5.3.bb"
# content [0eee3955b85d6ba2bd393cc5e7525c848366f62c]
#
# add_file "packages/git/git.inc"
# content [ce7e34b4dd8490461c6e668e1fc0f228df6a0f62]
#
# add_file "packages/ipkg/files/ipkg_bugfix.patch"
# content [7196e094a6eea0772015cde5f3c119ebec352085]
#
# add_file "packages/keymap-locales/files/qemux86/keymap-extension-2.6-fr.map"
# content [dcda4f8d7c74eaca57d330079644ded92cb2af23]
#
# add_file "packages/keymaps/files/qemux86/keymap-2.6.map"
# content [d1ec3472c997035f52b4ac59e2c2821a39f40c98]
#
# add_file "packages/libtool/libtool-1.5.10/libdir-la2.patch"
# content [d1963c450f45aec334ceb0c17f3a8beeb5f990df]
#
# add_file "packages/libtool/libtool-1.5.10/nmedit_fix.patch"
# content [aab94763555e9c9e126cfe1aa734e1c23e4acc70]
#
# add_file "packages/libtool/libtool-1.5.10/nousrlib.patch"
# content [538e988983e99646792a9cd6ddc81d748cf8eaa1]
#
# add_file "packages/pulseaudio/pulseaudio_0.9.8.bb"
# content [815657961892febee8418dbc92e3e829a156e821]
#
# add_file "site/arm-darwin"
# content [000e65302e528d3c33819d531644b3142ca15c92]
#
# patch "classes/base.bbclass"
# from [d94e4a54d0b01a3d7a66b2c418f28f37616379ab]
# to [a42a0cea14f8090cf64528a459fa8b5795e36327]
#
# patch "classes/cross.bbclass"
# from [8ef5df86820dc67931c8ddb72f1fe303ee04f0b8]
# to [504bbe85b9aae389cdf483045310b7f26d7a5fb4]
#
# patch "classes/debian.bbclass"
# from [3faf23c6fd98ff2bd435268edd5e503953d4eef5]
# to [2a365d85a6678f446949df94f9e76dad1677e376]
#
# patch "classes/package.bbclass"
# from [5d45a61dc3bb51e27788fa8ef8316543e655f7d6]
# to [64623cb5ec9aca92b3faacf2075e146fcce623d9]
#
# patch "classes/siteinfo.bbclass"
# from [12a7c72c9a63a94e4f6bc81705c78b04597df2a7]
# to [ad8a25b8d98422ba10f5dd64a960dccedae4f42f]
#
# patch "conf/bitbake.conf"
# from [296476eab302b3db132347510f665c6d65f38712]
# to [a1f6c5d6d3d4d66c93aa695c408f6bd53a242eb4]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [05ca84273c41744cd1fec58e61038e6ce197c091]
# to [c6bbfa10816eda24513e92b21827c75003bb4daa]
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [a44e85b6e6e664e9244ae58e75d3bf2d3d3162cf]
# to [1ea5dcfd838edd17ffbc00d7af4de7866da4c071]
#
# patch "conf/machine/include/ixp4xx.inc"
# from [cb920f8ba1f7dcaa3cd855595d1197004c12a26a]
# to [061e47cc6cd7843090e32bb8bbe59909e1f3df1e]
#
# patch "packages/angstrom/angstrom-feed-configs.bb"
# from [e16e9d7e55e13796f4551ba6ba67f36046f98ca0]
# to [510e68c1fe9549ec8bad9baa1ed4a7ce8c59a1af]
#
# patch "packages/e2fsprogs/e2fsprogs-native_1.38.bb"
# from [194a215a4edb95963af9fcb9b6930a82954a9287]
# to [3f5668e4ce48c4da699c6897e46425f79de881b9]
#
# patch "packages/e2fsprogs/e2fsprogs.inc"
# from [74053e769e29b3f7f7ccf89c6c51a299713f56ca]
# to [da4915afadd5e7e959c27d508cbcc77eebada9f0]
#
# patch "packages/e2fsprogs/e2fsprogs_1.38.bb"
# from [9586b51250df7775ec3746fb6eca617a1b70fa8e]
# to [4cef25c35903aa641d2b356d6bdc6311c9fc90e4]
#
# patch "packages/flite/flite_1.3.bb"
# from [266d6ef692d5121beffde4c7bebca82f6a608814]
# to [363795c4972e7ad5e6d61f99a42533e41f8eaed7]
#
# patch "packages/gcc/gcc-cross-initial_4.2.1.bb"
# from [c9b958214de00fddf6a53c3627db2faca6c8c588]
# to [6f04b3c99d0965567ffc37200aa7b10cff34845b]
#
# patch "packages/gcc/gcc-cross-initial_4.2.2.bb"
# from [c9b958214de00fddf6a53c3627db2faca6c8c588]
# to [6f04b3c99d0965567ffc37200aa7b10cff34845b]
#
# patch "packages/gcc/gcc-cross_4.2.1.bb"
# from [4c5116567bdde8af3df8995f4e852f42987248d4]
# to [8c369284668b4f7e7cd8104c4e8ee7df156518d9]
#
# patch "packages/gcc/gcc-cross_4.2.2.bb"
# from [f74cd13c9931a327e5694a1c3ce7fda09afc5511]
# to [fb8c2385fd08a3e2000d725d7155b0118591e2b7]
#
# patch "packages/gtk+/gdk-pixbuf_2.10.14.bb"
# from [3c53647f0df0c1e147fdccf3679a22bc6128bc18]
# to [3f4ef78e369b41a0f8ccf8a4fe57f2e72ec08eac]
#
# patch "packages/images/nslu2-minimal-image.bb"
# from [b79cc878de38e428c269688f55fbd183cf6081c6]
# to [14898795bea95dfcd88ed66ae25730964af725c5]
#
# patch "packages/ipkg/ipkg-native_0.99.163.bb"
# from [87ca1449de6ccb2e78e19bcbabdaf6368070902b]
# to [254630516ad5b6def75021ad9bb723fd5e62382f]
#
# patch "packages/keymap-locales/keymap-locales.bb"
# from [a33e43cd332201639af2444dd6dc7501c4d8c1cd]
# to [f1c008e9032b4001e8748378b70d8a443f4fdb98]
#
# patch "packages/keymaps/keymaps_1.0.bb"
# from [3d4559ff72d8ee62c8c6e5e31eacbb263c5bf70a]
# to [a825720db34844d7b47150bd1ad3defadea0bb35]
#
# patch "packages/libtool/libtool-cross_1.5.10.bb"
# from [ea1ba26d91260c163e077eaf1ce72502cb22d75c]
# to [54bc11a40b3ffda524161118db81f8521ce06a24]
#
# patch "packages/libtool/libtool-native_1.5.10.bb"
# from [3db44cdc921e61d2528664266cd0eda2cbf4d430]
# to [1637e2be734e54d7a59c21c3b10070585210ca96]
#
# patch "packages/libtool/libtool_1.5.10.bb"
# from [a09ef5ec1049aa5911eaaeb30a1d607825a17d58]
# to [4e7a487d5beec4d7a20adea55794f9747fd8ab75]
#
# patch "packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-rtc.patch"
# from [953bccbd5cef5767c0a922ebc7eeae4691dbfb65]
# to [ff0d1ce1d75cdce073d98a76611e56dc14eaa2bc]
#
# patch "packages/linux/linux-ixp4xx/defconfig-2.6.21.6"
# from [c8f2393bacd7f497d9c1c712cfe77848122b86d2]
# to [9ca518ef9fe19819dabdafe4129c5c8b3bc39729]
#
# patch "packages/linux/linux-ixp4xx_2.6.21.6.bb"
# from [f754b93eafcd639331fbc458e277dc3b7f52330d]
# to [432d1186db63f39ff236b15e6d5206fd96c5470e]
#
# patch "packages/linux/linux-ixp4xx_2.6.23.8.bb"
# from [74a1a67b09d506c633f8fd365bdc1b3c521a46f6]
# to [5072d1cda9fcc89b0db1894b9225812ec971acc9]
#
# patch "packages/linux/linux_2.6.23.bb"
# from [1ad744b33520a65188c10577d6ef70a69a3554aa]
# to [fb5e490f36b730f495e7bf48a7fcd8af38e6a3a7]
#
# patch "packages/lyx/lyx_1.4.1.bb"
# from [b47cd9a9b59ec8efd84f7ade62935b63e15fee89]
# to [4ecba0a849dcbb870938315383cfe642f55ad8c5]
#
# patch "packages/lyx/lyx_1.4.4.bb"
# from [2c90c18da6fe12531245213b8e2f6001469753b1]
# to [7b49ce4d2778fb61d04e0dd3486d062f09f1e6f8]
#
# patch "packages/lyx/lyx_1.5.1.bb"
# from [5541c792ef4a873fa0fcb9ed299cb24666497562]
# to [64d2311f21febb13095d37580b44f343bce894b1]
#
# patch "packages/meta/meta-toolchain.bb"
# from [5ede0ab68d89b645b8a529a7753ba969648d4bb0]
# to [6a7cecb31e297844a67f19888a2e7489e81d948c]
#
# patch "packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb"
# from [9461f60e0cada163ae639077c522bde341f9c8e7]
# to [f6a5b6af3be5cad7ac5505774e30c5b13e1687b5]
#
# patch "packages/pulseaudio/pulse.inc"
# from [27a820341557f336debad69f0b2b30c012a2749a]
# to [d02a339e8d4ccdea7eb613a6303f1b7681494b6c]
#
# patch "packages/shasum/shasum-native.bb"
# from [b95046276d5dbfc6a4b6ddf7caeb118f40eb4edd]
# to [ec69cdeaa4425bd2cd8dd606873c4834474b0465]
#
# patch "packages/stage-manager/files/stage-manager"
# from [1368a040e4fc6b8a70a83f348cacf1c31683f7cf]
# to [fb9aad832b3e02894ec5c57f49b3de656987cd54]
#
# patch "packages/stage-manager/stagemanager-native_0.0.1.bb"
# from [2c67701cd33fc4fa2760a291fa2337c04e3420cd]
# to [3c3bbddbeddf23d86eb06dd0518a8e7c5185345c]
#
# patch "packages/tasks/task-base.bb"
# from [1a67a9902fc957b26de1621d69f747dac26ee6e2]
# to [6f33e4ea8083953d24993dca089ae71114f8a639]
#
# patch "packages/tasks/task-boot.bb"
# from [60ad04f700c75a0e13d10eb6be05890318c5b6ae]
# to [20830050f274ccd1736b3833d5540df643b893c8]
#
# patch "packages/x11vnc/x11vnc_0.9.3.bb"
# from [b96331abea630fdec35fc060d5a57913a178461a]
# to [aa732c8e4a44358ecadf82dfb92bfb011ab2bd20]
#
# patch "site/common-glibc"
# from [6805917425c88e6085e0d4ddc9881ab19e272e62]
# to [4405815e133a050b155173bd66db32480d6feae1]
#
============================================================
--- classes/packaged-staging2.bbclass 59a91d125afea47071a318c45a9942ffd3d8111b
+++ classes/packaged-staging2.bbclass 59a91d125afea47071a318c45a9942ffd3d8111b
@@ -0,0 +1,229 @@
+#
+# Populate builds using prebuilt packages where possible to speed up builds
+# and allow staging to be reconstructed.
+#
+# To use it add that line to conf/local.conf:
+#
+# INHERIT = "packaged-staging"
+
+python () {
+ import bb
+ if not bb.data.inherits_class('native', d) and not bb.data.inherits_class('image', d) and not bb.data.inherits_class('cross', d) and not bb.data.inherits_class('sdk', d):
+ deps = bb.data.getVarFlag('do_populate_staging', 'depends', d) or ""
+ deps += " stagemanager-native:do_populate_staging"
+ bb.data.setVarFlag('do_populate_staging', 'depends', deps, d)
+
+ deps = bb.data.getVarFlag('do_prepackaged_stage', 'depends', d) or ""
+ deps += " ipkg-native:do_populate_staging ipkg-utils-native:do_populate_staging"
+ bb.data.setVarFlag('do_prepackaged_stage', 'depends', deps, d)
+ else:
+ bb.data.setVar("PSTAGING_DISABLED", "1", d)
+}
+
+export PSTAGING_DISABLED = "0"
+
+DEPLOY_DIR_PSTAGE = "${DEPLOY_DIR}/pstage"
+
+PSTAGE_BUILD_CMD = "${IPKGBUILDCMD}"
+PSTAGE_INSTALL_CMD = "ipkg-cl install -force-depends -f ${DEPLOY_DIR_PSTAGE}/ipkg-${MACHINE}.conf -o ${TMPDIR}"
+PSTAGE_UPDATE_CMD = "ipkg-cl update -f ${DEPLOY_DIR_PSTAGE}/ipkg-${MACHINE}.conf -o ${TMPDIR}"
+PSTAGE_REMOVE_CMD = "ipkg-cl remove -force-depends -f ${DEPLOY_DIR_PSTAGE}/ipkg-${MACHINE}.conf -o ${TMPDIR}"
+PSTAGE_LIST_CMD = "ipkg-cl list_installed -f ${DEPLOY_DIR_PSTAGE}/ipkg-${MACHINE}.conf -o ${TMPDIR}"
+PSTAGE_PKGNAME = "staging-${PN}_${PV}-${PR}_${MULTIMACH_ARCH}.ipk"
+
+PSTAGE_TMPDIR_STAGE = "${WORKDIR}/staging-pkg"
+
+do_clean_append() {
+ """
+ Clear the build and temp directories
+ """
+ bb.note("Uninstalling package from staging...")
+ path = bb.data.getVar("PATH", d, 1)
+ removecmd = bb.data.getVar("PSTAGE_REMOVE_CMD", d, 1)
+ removepkg = bb.data.expand("staging-${PN}", d)
+ ret = os.system("PATH=\"%s\" %s %s" % (path, removecmd, removepkg))
+ if ret != 0:
+ bb.note("Failure removing staging package")
+
+ stagepkg = bb.data.expand("${DEPLOY_DIR_PSTAGE}/${PSTAGE_PKGNAME}", d)
+ bb.note("Removing staging package %s" % stagepkg)
+ #os.system('rm -rf ' + stagepkg)
+}
+
+staging_helper () {
+ #assemble appropriate ipkg.conf
+ conffile=${DEPLOY_DIR_PSTAGE}/ipkg-${MACHINE}.conf
+ mkdir -p ${DEPLOY_DIR_PSTAGE}/pstaging_lists
+ if [ ! -e $conffile ]; then
+ ipkgarchs="${BUILD_ARCH} all any noarch ${TARGET_ARCH} ${PACKAGE_ARCHS} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}"
+ priority=1
+ for arch in $ipkgarchs; do
+ echo "arch $arch $priority" >> $conffile
+ priority=$(expr $priority + 5)
+ done
+ echo "src oe-staging file:${DEPLOY_DIR_PSTAGE}" >> $conffile
+
+ OLD_PWD=`pwd`
+ cd ${DEPLOY_DIR_PSTAGE}
+ ipkg-make-index -p Packages .
+ cd ${OLD_PWD}
+
+ ${PSTAGE_UPDATE_CMD}
+ fi
+}
+
+python do_prepackaged_stage () {
+ import os
+
+ if bb.data.getVar("PSTAGING_DISABLED", d, 1) == "1":
+ bb.build.make_stamp("do_prepackaged_stage", d)
+ return
+
+ bb.note("Uninstalling any existing package from staging...")
+ path = bb.data.getVar("PATH", d, 1)
+ removecmd = bb.data.getVar("PSTAGE_REMOVE_CMD", d, 1)
+ removepkg = bb.data.expand("staging-${PN}", d)
+ lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d))
+ ret = os.system("PATH=\"%s\" %s %s" % (path, removecmd, removepkg))
+ bb.utils.unlockfile(lf)
+ if ret != 0:
+ bb.note("Failure attempting to remove staging package")
+
+ stagepkg = bb.data.expand("${DEPLOY_DIR_PSTAGE}/${PSTAGE_PKGNAME}", d)
+
+ if os.path.exists(stagepkg):
+ bb.note("Following speedup\n")
+ path = bb.data.getVar("PATH", d, 1)
+ installcmd = bb.data.getVar("PSTAGE_INSTALL_CMD", d, 1)
+
+ bb.build.exec_func("staging_helper", d)
+
+ bb.debug(1, "Staging stuff already packaged, using that instead")
+ lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d))
+ ret = os.system("PATH=\"%s\" %s %s" % (path, installcmd, stagepkg))
+ bb.utils.unlockfile(lf)
+ if ret != 0:
+ bb.note("Failure installing prestage package")
+
+ bb.build.make_stamp("do_prepackaged_stage", d)
+ bb.build.make_stamp("do_fetch", d)
+ bb.build.make_stamp("do_unpack", d)
+ bb.build.make_stamp("do_munge", d)
+ bb.build.make_stamp("do_patch", d)
+ bb.build.make_stamp("do_configure", d)
+ bb.build.make_stamp("do_qa_configure", d)
+ bb.build.make_stamp("do_rig_locales", d)
+ bb.build.make_stamp("do_compile", d)
+ bb.build.make_stamp("do_install", d)
+ bb.build.make_stamp("do_deploy", d)
+ bb.build.make_stamp("do_package", d)
+ bb.build.make_stamp("do_populate_staging", d)
+ bb.build.make_stamp("do_package_write_deb", d)
+ bb.build.make_stamp("do_package_write_ipk", d)
+ bb.build.make_stamp("do_package_write", d)
+ bb.build.make_stamp("do_package_stage", d)
+ bb.build.make_stamp("do_qa_staging", d)
+
+ else:
+ bb.build.make_stamp("do_prepackaged_stage", d)
+}
+do_prepackaged_stage[cleandirs] = "${PSTAGE_TMPDIR_STAGE}"
+do_prepackaged_stage[selfstamp] = "1"
+addtask prepackaged_stage before do_fetch
+
+populate_staging_preamble () {
+ if [ "$PSTAGING_DISABLED" != "1" ]; then
+ #mkdir -p ${DEPLOY_DIR_PSTAGE}
+
+ stage-manager -p ${STAGING_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-staging -u
+ stage-manager -p ${CROSS_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-cross -u
+ fi
+}
+
+populate_staging_postamble () {
+ if [ "$PSTAGING_DISABLED" != "1" ]; then
+ # list the packages currently installed in staging
+ ${PSTAGE_LIST_CMD} | awk '{print $1}' > ${DEPLOY_DIR_PSTAGE}/installed-list
+
+ set +e
+ stage-manager -p ${STAGING_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-staging -u -d ${PSTAGE_TMPDIR_STAGE}/staging
+ stage-manager -p ${CROSS_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-cross -u -d ${PSTAGE_TMPDIR_STAGE}/cross
+ set -e
+ fi
+}
+
+do_populate_staging[lockfiles] = "${STAGING_DIR}/staging.lock"
+do_populate_staging[dirs] =+ "${DEPLOY_DIR_PSTAGE}"
+python do_populate_staging_prepend() {
+ bb.build.exec_func("populate_staging_preamble", d)
+}
+
+python do_populate_staging_append() {
+ bb.build.exec_func("populate_staging_postamble", d)
+}
+
+
+staging_packager () {
+
+ mkdir -p ${PSTAGE_TMPDIR_STAGE}/CONTROL
+
+ echo "Package: staging-${PN}" > ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
+ echo "Version: ${PV}-${PR}" >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
+ echo "Description: ${DESCRIPTION}" >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
+ echo "Section: ${SECTION}" >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
+ echo "Priority: Optional" >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
+ echo "Maintainer: ${MAINTAINER}" >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
+ echo "Architecture: ${MULTIMACH_ARCH}" >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
+ echo "Source: ${SRC_URI}" >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
+
+ ${PSTAGE_BUILD_CMD} ${PSTAGE_TMPDIR_STAGE} ${DEPLOY_DIR_PSTAGE}
+ ${PSTAGE_INSTALL_CMD} ${DEPLOY_DIR_PSTAGE}/${PSTAGE_PKGNAME}
+}
+
+python do_package_stage () {
+ if bb.data.getVar("PSTAGING_DISABLED", d, 1) == "1%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list