From 0793456d9399a57b490237eb776011845d6b6769 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 24 Jan 2008 12:33:11 +0000 Subject: contrib/distro-packages: fix an error in changelog so devscripts do work again --- .../distro-packages/debian/openembedded-essential-1.4/debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/distro-packages/debian/openembedded-essential-1.4/debian/changelog b/contrib/distro-packages/debian/openembedded-essential-1.4/debian/changelog index 74193e30fd..8485f3e720 100644 --- a/contrib/distro-packages/debian/openembedded-essential-1.4/debian/changelog +++ b/contrib/distro-packages/debian/openembedded-essential-1.4/debian/changelog @@ -3,7 +3,7 @@ openembedded-essential (1.4) unstable; urgency=low * remove gfortran from dependency after a5c7b007eaa675cc904f5285291d2f8a597efc84 caused controversy. Ultimately it was decided that OE should not depend on gfortran and that another solution ought to be found. The gfortran check in sanity.bbclass was dropped in 63c7ad87655c2781ad8b9c81af430596f48a24a6 -* add bc and python-pysqlite2 + * add bc and python-pysqlite2 for rpm -- Rolf Leggewie Mon, 19 Jan 2008 14:25:00 +0100 -- cgit v1.2.3 From e762f9c4ea24e9bd3adebe51f2a88d5f95ea1cb6 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 24 Jan 2008 13:03:46 +0000 Subject: contrib/distro-packages: provide patch for building ubuntu packages --- .../debian/openembedded-essential-1.4/ubuntu.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 contrib/distro-packages/debian/openembedded-essential-1.4/ubuntu.patch (limited to 'contrib') diff --git a/contrib/distro-packages/debian/openembedded-essential-1.4/ubuntu.patch b/contrib/distro-packages/debian/openembedded-essential-1.4/ubuntu.patch new file mode 100644 index 0000000000..80863d59fe --- /dev/null +++ b/contrib/distro-packages/debian/openembedded-essential-1.4/ubuntu.patch @@ -0,0 +1,22 @@ +# +# old_revision [63896b37ec0e055133c2e295f7c89e4677091511] +# +# patch "contrib/distro-packages/debian/openembedded-essential-1.4/debian/changelog" +# from [b1e7c5d0ed3dddbab736f23b57df2386b6937e4d] +# to [bb02f8caa6f5eaa903b4d65150392583072c7bea] +# +============================================================ +--- contrib/distro-packages/debian/openembedded-essential-1.4/debian/changelog +b1e7c5d0ed3dddbab736f23b57df2386b6937e4d ++++ contrib/distro-packages/debian/openembedded-essential-1.4/debian/changelog +bb02f8caa6f5eaa903b4d65150392583072c7bea +@@ -1,3 +1,9 @@ ++openembedded-essential (1.4ubuntu1) gutsy; urgency=low ++ ++ * prepare ubuntu package ++ ++ -- Rolf Leggewie Thu, 24 Jan 2008 13:49:26 +0100 ++ + openembedded-essential (1.4) unstable; urgency=low + + * remove gfortran from dependency after a5c7b007eaa675cc904f5285291d2f8a597efc84 caused controversy. -- cgit v1.2.3 From 98f4c2d3847393f4e853c3f07a0ac4fc8ad3d9fb Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Tue, 5 Feb 2008 15:46:16 +0000 Subject: oe-stylize.py: add support for the PE (package epoch) variable --- contrib/oe-stylize.py | 1 + 1 file changed, 1 insertion(+) (limited to 'contrib') diff --git a/contrib/oe-stylize.py b/contrib/oe-stylize.py index a92b58dc73..5658c1662d 100755 --- a/contrib/oe-stylize.py +++ b/contrib/oe-stylize.py @@ -42,6 +42,7 @@ OE_vars = [ 'RPROVIDES', 'RCONFLICTS', 'SRCDATE', + 'PE', 'PV', 'PR', 'SRC_URI', -- cgit v1.2.3 From c4b9bd13292f10884ad96854b79b1d22251bd1e7 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 6 Feb 2008 16:36:16 +0000 Subject: contrib/image-convert: Add scripts to convert FS images to different formats. * Per RFC on the list. --- contrib/image-convert/.mtn2git_empty | 0 contrib/image-convert/README | 5 +++++ contrib/image-convert/cpio2tar | 9 +++++++++ contrib/image-convert/tar2ext2 | 25 +++++++++++++++++++++++++ contrib/image-convert/tar2ext2.mount | 25 +++++++++++++++++++++++++ contrib/image-convert/tar2jffs | 8 ++++++++ 6 files changed, 72 insertions(+) create mode 100644 contrib/image-convert/.mtn2git_empty create mode 100644 contrib/image-convert/README create mode 100755 contrib/image-convert/cpio2tar create mode 100755 contrib/image-convert/tar2ext2 create mode 100755 contrib/image-convert/tar2ext2.mount create mode 100755 contrib/image-convert/tar2jffs (limited to 'contrib') diff --git a/contrib/image-convert/.mtn2git_empty b/contrib/image-convert/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/contrib/image-convert/README b/contrib/image-convert/README new file mode 100644 index 0000000000..9daca60703 --- /dev/null +++ b/contrib/image-convert/README @@ -0,0 +1,5 @@ +This directory contains scripts to convert (root) filesystem images from one +format to another. While OpenEmbedded has extensive support for generating +images in various formats, sometimes it may be useful/needed to convert +already existing image. + diff --git a/contrib/image-convert/cpio2tar b/contrib/image-convert/cpio2tar new file mode 100755 index 0000000000..7f2c92fe26 --- /dev/null +++ b/contrib/image-convert/cpio2tar @@ -0,0 +1,9 @@ +#!/bin/sh + +STAGING= #~/linux-ppc/build-oe-angstrom/tmp/staging/i686-linux/bin/ + +${STAGING}fakeroot bash -c " \ +rm -rf scratch; mkdir scratch; \ +cd scratch; gzip -d -c ../$1 | cpio -i --make-directories; \ +cd ..; \ +tar -cj -C scratch -f $(basename $1 .cpio.gz).tar.bz2 ." diff --git a/contrib/image-convert/tar2ext2 b/contrib/image-convert/tar2ext2 new file mode 100755 index 0000000000..d5756a4733 --- /dev/null +++ b/contrib/image-convert/tar2ext2 @@ -0,0 +1,25 @@ +#!/bin/sh + +if [ $# -ne 2 ]; then + echo "Usage: $0 " + exit +fi + +ext=`echo $1 | sed -r -e 's/.+\.([^.]+\.[^.]+)/\1/'` +base=$(basename $1 .$ext) +dir=$(dirname $1) + +if [ "$ext" == "tar.bz2" ]; then + uncompress=j +else + uncompress=z +fi + +rm -rf mnt +mkdir -p mnt + +fakeroot bash -c "\ +tar -x$uncompress -f $1 -C mnt; \ +genext2fs -d mnt -b $(($2 * 1024)) $dir/$base.img; \ +rm -rf mnt; \ +" diff --git a/contrib/image-convert/tar2ext2.mount b/contrib/image-convert/tar2ext2.mount new file mode 100755 index 0000000000..7e23098c4d --- /dev/null +++ b/contrib/image-convert/tar2ext2.mount @@ -0,0 +1,25 @@ +#!/bin/sh + +if [ $# -ne 2 ]; then + echo "Usage: $0 " + exit +fi + +ext=`echo $1 | sed -r -e 's/.+\.([^.]+\.[^.]+)/\1/'` +base=$(basename $1 .$ext) +if [ "$ext" == "tar.bz2" ]; then + uncompress=j +else + uncompress=z +fi + +dd if=/dev/zero of=$base.img bs=1M count=$2 +mkfs.ext2 -F -m1 $base.img + +mkdir -p mnt +mount -o loop $base.img mnt + +tar -x$uncompress -f $1 -C mnt + +umount mnt +rm -rf mnt diff --git a/contrib/image-convert/tar2jffs b/contrib/image-convert/tar2jffs new file mode 100755 index 0000000000..7bf158e4a5 --- /dev/null +++ b/contrib/image-convert/tar2jffs @@ -0,0 +1,8 @@ +#!/bin/sh + +STAGING= #~/linux-ppc/build-oe-angstrom/tmp/staging/i686-linux/bin/ + +${STAGING}fakeroot bash -c " \ +rm -rf scratch; mkdir scratch; \ +tar -xj -f $1 -C scratch; \ +${STAGING}mkfs.jffs2 -x lzo --root=scratch --faketime --output=$(dirname $1)/$(basename $1 .tar.bz2).jffs2" -- cgit v1.2.3 From f9bddb5b33d01ef9528acd2185396f8f61711913 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 9 Feb 2008 09:32:19 +0000 Subject: contrib/angstrom/rss2.php: Add date of build to subject. * To help with simple-minded browsers which don't show pubDate (like Firefox). * Per RFC on the list. --- contrib/angstrom/rss2.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/angstrom/rss2.php b/contrib/angstrom/rss2.php index 995c344e14..2e1f49c4cc 100644 --- a/contrib/angstrom/rss2.php +++ b/contrib/angstrom/rss2.php @@ -47,7 +47,7 @@ foreach($builder_log_date as $build) $data = explode(' ', $build); $rss_xml->startElement('item'); - $rss_xml->writeElement('title', "{$data[1]} ({$data[2]}) built for {$data[3]}"); + $rss_xml->writeElement('title', "{$data[1]} ({$data[2]}) built for {$data[3]} (" . date('c', $data[0]) . ")"); $rss_xml->writeElement('link', "{$build_link_base}{$data[3]}/"); $rss_xml->writeElement('pubDate', date('r', $data[0])); -- cgit v1.2.3 From 570e63a2f80ccff168d0ab9fd23dc7ed7aa411e3 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 9 Feb 2008 09:35:06 +0000 Subject: contrib/angstrom/rss*.php: Drop old non-optimal version, rename rss2 to rss. * Per RFC on the list. --- contrib/angstrom/rss.php | 87 +++++++++++++++++++++++++++-------------------- contrib/angstrom/rss2.php | 63 ---------------------------------- 2 files changed, 51 insertions(+), 99 deletions(-) delete mode 100644 contrib/angstrom/rss2.php (limited to 'contrib') diff --git a/contrib/angstrom/rss.php b/contrib/angstrom/rss.php index cf5a9e0218..2e1f49c4cc 100644 --- a/contrib/angstrom/rss.php +++ b/contrib/angstrom/rss.php @@ -1,48 +1,63 @@ -'); ?> - - - Ångström autobuilder updates - http://www.angstrom-distribution.org/unstable/autobuild/ - - en openMemory(); - echo "\n" - echo "$file/$file2 uploaded\n"; - echo " http://www.angstrom-distribution.org/unstable/autobuild/$file/$file2\n"; +$rss_xml->startDocument('1.0','utf-8'); +$rss_xml->startElement('rss'); +$rss_xml->writeAttribute('version', '2.0'); - $rsstime = strftime("%a, %d %b %Y %T +0100", $fmtime); +$rss_xml->startElement('channel'); - echo "$rsstime\n"; - echo "Angstrom autobuilder"; - echo "\n"; - } - } +$rss_xml->writeElement('title', 'Ångström autobuilder updates'); +$rss_xml->writeElement('link', $build_link_base); +$rss_xml->writeElement('description', 'Ångström autobuilder updates list'); - closedir($second_handle); - } +foreach($builder_log_date as $build) +{ + $build = str_replace("\n", "", $build); + $data = explode(' ', $build); + + $rss_xml->startElement('item'); + $rss_xml->writeElement('title', "{$data[1]} ({$data[2]}) built for {$data[3]} (" . date('c', $data[0]) . ")"); + $rss_xml->writeElement('link', "{$build_link_base}{$data[3]}/"); + $rss_xml->writeElement('pubDate', date('r', $data[0])); - closedir($handle); + $rss_xml->endElement(); } + +$rss_xml->endElement(); +$rss_xml->endElement(); + +echo $rss_xml->outputMemory(true); + +echo "\n"; ?> - - diff --git a/contrib/angstrom/rss2.php b/contrib/angstrom/rss2.php deleted file mode 100644 index 2e1f49c4cc..0000000000 --- a/contrib/angstrom/rss2.php +++ /dev/null @@ -1,63 +0,0 @@ -openMemory(); - -$rss_xml->startDocument('1.0','utf-8'); -$rss_xml->startElement('rss'); -$rss_xml->writeAttribute('version', '2.0'); - -$rss_xml->startElement('channel'); - -$rss_xml->writeElement('title', 'Ångström autobuilder updates'); -$rss_xml->writeElement('link', $build_link_base); -$rss_xml->writeElement('description', 'Ångström autobuilder updates list'); - -foreach($builder_log_date as $build) -{ - $build = str_replace("\n", "", $build); - $data = explode(' ', $build); - - $rss_xml->startElement('item'); - $rss_xml->writeElement('title', "{$data[1]} ({$data[2]}) built for {$data[3]} (" . date('c', $data[0]) . ")"); - $rss_xml->writeElement('link', "{$build_link_base}{$data[3]}/"); - $rss_xml->writeElement('pubDate', date('r', $data[0])); - - $rss_xml->endElement(); -} - -$rss_xml->endElement(); -$rss_xml->endElement(); - -echo $rss_xml->outputMemory(true); - -echo "\n"; -?> -- cgit v1.2.3