[oe-commits] org.oe.dev merge of '4f55fef36523ba6ae829feec111a2bcd0e9e7088'
hrw commit
oe at amethyst.openembedded.net
Thu Apr 17 13:23:20 UTC 2008
merge of '4f55fef36523ba6ae829feec111a2bcd0e9e7088'
and 'b96f9f2ce38832413116be9151b3f4213200e5ff'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 36bf6ed41d5a4e0c89e3eda9b2b04bbc9b35d6c1
ViewMTN: http://monotone.openembedded.org/revision/info/36bf6ed41d5a4e0c89e3eda9b2b04bbc9b35d6c1
Files:
1
packages/xorg-lib/libx11-native_1.1.4.bb
packages/linux/linux-beagleboard
packages/linux/linux-beagleboard_git.bb
packages/linux/linux-davinci/binutils-buildid-arm.patch
packages/linux/linux-davinci/davinci-nand.patch
packages/wlan-ng/wlan-ng-modules-0.2.1-pre26
packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/config.in
packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/no-compat.patch
packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/only-the-modules.patch
packages/wlan-ng/wlan-ng-modules-0.2.3
packages/wlan-ng/wlan-ng-modules-0.2.3/config.in
packages/wlan-ng/wlan-ng-modules-0.2.3/module_param_array.patch
packages/wlan-ng/wlan-ng-modules-0.2.3/modules-symvers.patch
packages/wlan-ng/wlan-ng-modules-0.2.3/only-the-modules.patch
packages/wlan-ng/wlan-ng-modules-0.2.3/prism2sta_commsqual_defer.patch
packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823
packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/only-the-modules.patch
packages/wlan-ng/wlan-ng-modules-0.2.5+svn20061109
packages/wlan-ng/wlan-ng-modules-0.2.5+svn20061109/only-the-modules.patch
packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb
packages/wlan-ng/wlan-ng-modules_0.2.3.bb
packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb
packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb
packages/wlan-ng/wlan-ng-modules_svn.bb
packages/wlan-ng/wlan-ng-utils-0.2.1-pre26
packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/config.in
packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/only-the-utils.patch
packages/wlan-ng/wlan-ng-utils-0.2.2
packages/wlan-ng/wlan-ng-utils-0.2.2/config.in
packages/wlan-ng/wlan-ng-utils-0.2.2/only-the-utils.patch
packages/wlan-ng/wlan-ng-utils-0.2.3
packages/wlan-ng/wlan-ng-utils-0.2.3/config.in
packages/wlan-ng/wlan-ng-utils-0.2.3/only-the-utils.patch
packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823
packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/config.in
packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/only-the-utils.patch
packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb
packages/wlan-ng/wlan-ng-utils_0.2.3.bb
packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb
packages/wlan-ng/wlan-ng-utils_svn.bb
packages/libtomcrypt/libtomcrypt_0.97b.bb
packages/libtomcrypt/libtomcrypt_1.17.bb
packages/xorg-xserver/xserver-kdrive-1.4.0.90
packages/xorg-xserver/xserver-kdrive-1.4.99.901
contrib/angstrom/sort.sh
packages/klibc/files/wc.patch
packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-cardbus.patch
packages/linux/linux-davinci/davinci-sffsdr/sffsdr.patch
packages/linux/linux-omap2-git/beagleboard/1-rearrange-omap3.patch
packages/linux/linux-omap2-git/beagleboard/2-update-omap3evm-kconfig.patch
packages/linux/linux-omap2-git/beagleboard/3-omap3evm-board.patch
packages/linux/linux-omap2-git/beagleboard/4-omap3evm-config.patch
packages/linux/linux-omap2-git/beagleboard/5-omap3evm-header.patch
packages/linux/linux-omap2-git/beagleboard/add-beagle-sd-support.diff
packages/linux/linux-omap2-git/beagleboard/beagle-board-file.diff
packages/linux/linux-omap2-git/beagleboard/beagle-board-header.diff
packages/linux/linux-omap2-git/beagleboard/beagle-kconfig-makefile.diff
packages/xorg-xserver/xserver-kdrive-1.4.0.90/disable-xf86-dga-xorgcfg.patch
packages/xorg-xserver/xserver-kdrive-1.4.0.90/enable-tslib.patch
packages/xorg-xserver/xserver-kdrive-1.4.0.90/enable-xcalibrate.patch
packages/xorg-xserver/xserver-kdrive-1.4.0.90/keyboard-resume-workaround.patch
packages/xorg-xserver/xserver-kdrive-1.4.0.90/linux-keyboard-mediumraw.patch
packages/xorg-xserver/xserver-kdrive-1.4.0.90/w100-autofoo.patch
packages/xorg-xserver/xserver-kdrive-1.4.99.901/disable-xf86-dga-xorgcfg.patch
packages/xorg-xserver/xserver-kdrive-1.4.99.901/enable-tslib.patch
packages/xorg-xserver/xserver-kdrive-1.4.99.901/keyboard-resume-workaround.patch
packages/xorg-xserver/xserver-kdrive-1.4.99.901/linux-keyboard-mediumraw.patch
packages/xorg-xserver/xserver-kdrive-1.4.99.901/no_xkb.patch
packages/xorg-xserver/xserver-kdrive-1.4.99.901/w100-autofoo.patch
packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb
packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb
classes/kernel.bbclass
conf/distro/angstrom-2008.1.conf
conf/distro/include/angstrom-2008-preferred-versions.inc
conf/machine/davinci-sffsdr.conf
packages/klibc/klibc-common.inc
packages/klibc/klibc-utils-static_1.5.bb
packages/klibc/klibc.inc
packages/klibc/klibc_1.5.bb
packages/libsdl/libsdl-qpe_1.2.9.bb
packages/libsdl/libsdl.inc
packages/linux/linux-2.6.24/mpc8313e-rdb/defconfig
packages/linux/linux-davinci/davinci-sffsdr/defconfig
packages/linux/linux-davinci_2.6.x+git-davinci.bb
packages/linux/linux-omap2-git/beagleboard/defconfig
packages/linux/linux-omap2_git.bb
packages/linux/linux_2.6.24.bb
packages/swt/swt-gtk.inc
packages/swt/swt3.3-gtk_3.3.1.bb
packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb
packages/swt/swt3.4-gtk-hildon_3.3+3.4M5.bb
packages/swt/swt3.4-gtk_3.3+3.4M3.bb
packages/swt/swt3.4-gtk_3.3+3.4M5.bb
mtn:execute
true
Diffs:
#
# mt diff -r4f55fef36523ba6ae829feec111a2bcd0e9e7088 -r36bf6ed41d5a4e0c89e3eda9b2b04bbc9b35d6c1
#
#
#
# patch "packages/xorg-lib/libx11-native_1.1.4.bb"
# from [9c54449eecb074402c7e86f91767a80e5a1fe88f]
# to [218ec197e44915ee50b64306c110709e47529ca7]
#
============================================================
--- packages/xorg-lib/libx11-native_1.1.4.bb 9c54449eecb074402c7e86f91767a80e5a1fe88f
+++ packages/xorg-lib/libx11-native_1.1.4.bb 218ec197e44915ee50b64306c110709e47529ca7
@@ -3,5 +3,6 @@ DEPENDS = "xproto-native xextproto-nativ
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
+PROVIDES = ""
inherit native
#
# mt diff -rb96f9f2ce38832413116be9151b3f4213200e5ff -r36bf6ed41d5a4e0c89e3eda9b2b04bbc9b35d6c1
#
#
#
# delete "packages/linux/linux-beagleboard"
#
# delete "packages/linux/linux-beagleboard_git.bb"
#
# delete "packages/linux/linux-davinci/binutils-buildid-arm.patch"
#
# delete "packages/linux/linux-davinci/davinci-nand.patch"
#
# delete "packages/wlan-ng/wlan-ng-modules-0.2.1-pre26"
#
# delete "packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/config.in"
#
# delete "packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/no-compat.patch"
#
# delete "packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/only-the-modules.patch"
#
# delete "packages/wlan-ng/wlan-ng-modules-0.2.3"
#
# delete "packages/wlan-ng/wlan-ng-modules-0.2.3/config.in"
#
# delete "packages/wlan-ng/wlan-ng-modules-0.2.3/module_param_array.patch"
#
# delete "packages/wlan-ng/wlan-ng-modules-0.2.3/modules-symvers.patch"
#
# delete "packages/wlan-ng/wlan-ng-modules-0.2.3/only-the-modules.patch"
#
# delete "packages/wlan-ng/wlan-ng-modules-0.2.3/prism2sta_commsqual_defer.patch"
#
# delete "packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823"
#
# delete "packages/wlan-ng/wlan-ng-modules-0.2.4+svn20060823/only-the-modules.patch"
#
# delete "packages/wlan-ng/wlan-ng-modules-0.2.5+svn20061109"
#
# delete "packages/wlan-ng/wlan-ng-modules-0.2.5+svn20061109/only-the-modules.patch"
#
# delete "packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb"
#
# delete "packages/wlan-ng/wlan-ng-modules_0.2.3.bb"
#
# delete "packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb"
#
# delete "packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb"
#
# delete "packages/wlan-ng/wlan-ng-modules_svn.bb"
#
# delete "packages/wlan-ng/wlan-ng-utils-0.2.1-pre26"
#
# delete "packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/config.in"
#
# delete "packages/wlan-ng/wlan-ng-utils-0.2.1-pre26/only-the-utils.patch"
#
# delete "packages/wlan-ng/wlan-ng-utils-0.2.2"
#
# delete "packages/wlan-ng/wlan-ng-utils-0.2.2/config.in"
#
# delete "packages/wlan-ng/wlan-ng-utils-0.2.2/only-the-utils.patch"
#
# delete "packages/wlan-ng/wlan-ng-utils-0.2.3"
#
# delete "packages/wlan-ng/wlan-ng-utils-0.2.3/config.in"
#
# delete "packages/wlan-ng/wlan-ng-utils-0.2.3/only-the-utils.patch"
#
# delete "packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823"
#
# delete "packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/config.in"
#
# delete "packages/wlan-ng/wlan-ng-utils-0.2.4+svn20060823/only-the-utils.patch"
#
# delete "packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb"
#
# delete "packages/wlan-ng/wlan-ng-utils_0.2.3.bb"
#
# delete "packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb"
#
# delete "packages/wlan-ng/wlan-ng-utils_svn.bb"
#
# rename "packages/libtomcrypt/libtomcrypt_0.97b.bb"
# to "packages/libtomcrypt/libtomcrypt_1.17.bb"
#
# add_dir "packages/xorg-xserver/xserver-kdrive-1.4.0.90"
#
# add_dir "packages/xorg-xserver/xserver-kdrive-1.4.99.901"
#
# add_file "contrib/angstrom/sort.sh"
# content [3c83857daf315ecca0771eff753f8ddb557f0002]
#
# add_file "packages/klibc/files/wc.patch"
# content [91dc314c8c1ad42f06a34d17214e5f6b6ee17b41]
#
# add_file "packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-cardbus.patch"
# content [bf271d9de4ce4c25b913e724dd0f6f56435f7f9a]
#
# add_file "packages/linux/linux-davinci/davinci-sffsdr/sffsdr.patch"
# content [540f3377225d179721cf1096db5ccc39e1428d80]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/1-rearrange-omap3.patch"
# content [a5ed44fee8b50a7e3c53448d3798262816a621c4]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/2-update-omap3evm-kconfig.patch"
# content [1800f44fdaead40c144903855cd1d9f9b038ce2e]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/3-omap3evm-board.patch"
# content [25d40405ed5624fbbfaa3a902b06992f987e6303]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/4-omap3evm-config.patch"
# content [f87e0386ec1b406a7cb6509c04d25f504453185c]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/5-omap3evm-header.patch"
# content [e06d8521d0d69566bb383167a3ec4b1fba0301da]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/add-beagle-sd-support.diff"
# content [5b8b065bd8faae9b61b1f2bb144a64aa2756eba3]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/beagle-board-file.diff"
# content [507af3911b21913a9191bac50a5457b6a7512ed8]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/beagle-board-header.diff"
# content [83cc6e0c0b3b983c76e60317e6dd9f5af371f0ff]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/beagle-kconfig-makefile.diff"
# content [04975309c0be85b1aedeb2dc407fec7984e381d5]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.0.90/disable-xf86-dga-xorgcfg.patch"
# content [0e8754f39994efeff67f876087794543f5ec4a2f]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.0.90/enable-tslib.patch"
# content [d8f011120dc0a345fc9c5f897049fea887c705c3]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.0.90/enable-xcalibrate.patch"
# content [08d76cc4f9d1c156f3ac72604bd0b9eb126d9b48]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.0.90/keyboard-resume-workaround.patch"
# content [2dd41bf751f18da06f0d638ee68db2ba1a670f11]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.0.90/linux-keyboard-mediumraw.patch"
# content [faca4d8feba0272517c84f11ac61a39c0b055556]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.0.90/w100-autofoo.patch"
# content [93931fd9a64ed0b3fee8337b05894bab22e14f63]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.99.901/disable-xf86-dga-xorgcfg.patch"
# content [0e8754f39994efeff67f876087794543f5ec4a2f]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.99.901/enable-tslib.patch"
# content [e4e8a8eaf8ef4e01658c38d62be037fe8a67c0ee]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.99.901/keyboard-resume-workaround.patch"
# content [2dd41bf751f18da06f0d638ee68db2ba1a670f11]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.99.901/linux-keyboard-mediumraw.patch"
# content [faca4d8feba0272517c84f11ac61a39c0b055556]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.99.901/no_xkb.patch"
# content [17027e633e5809ba281942d8c0a5d96710ff3b44]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.99.901/w100-autofoo.patch"
# content [93931fd9a64ed0b3fee8337b05894bab22e14f63]
#
# add_file "packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb"
# content [c45a81192919a98109d7b2e1550ccc2a98830f7e]
#
# add_file "packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb"
# content [c6a0c89707b56d7f1a5b713b7610e03059d08147]
#
# patch "classes/kernel.bbclass"
# from [a2023556ff7f2b754b62219b795ef6bf47185281]
# to [0e7bc22f0cbc8ab0efe1c7ffb69e9171f99a8b21]
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [0cad561952f505326b2ecaa67da40db351a7a50b]
# to [6f251e8e8c830f7c3e1ebbed08e46a6c642556d9]
#
# patch "conf/distro/include/angstrom-2008-preferred-versions.inc"
# from [d88513c46c7ccd9a74ab4e7fc7b3c7ee572463e0]
# to [e43372d57f0ae1a9fba2a682a7d44449a8f91103]
#
# patch "conf/machine/davinci-sffsdr.conf"
# from [e78c2776ef888446589865c926e40dbbcb5796e9]
# to [3b4784ac301d7f628129f269d9e9420fe71d44be]
#
# patch "packages/klibc/klibc-common.inc"
# from [f63bcd79d6bf261ecf2b188db14fc0d05f566d49]
# to [ccb876653934cbf5f4dab36b2e0f872ea6a374cf]
#
# patch "packages/klibc/klibc-utils-static_1.5.bb"
# from [294377bb13d3cf5efd6994870abd0ab9791b2c7b]
# to [07d4992c0cf89657c8e8886c714616b2908143af]
#
# patch "packages/klibc/klibc.inc"
# from [d53c11c9e1fd6fc8f6ebda72e283e32fce38c4e9]
# to [8d2b8d491a2f32c56a106fc771c37588ed5e4781]
#
# patch "packages/klibc/klibc_1.5.bb"
# from [7a3e8ba7ef141381c3e8bc1f15829474bcd8e2d8]
# to [da0ed0aee0f0a1183a68d18409fede8ae945922a]
#
# patch "packages/libsdl/libsdl-qpe_1.2.9.bb"
# from [bc4c99538eb36cd779ec379046f207fb0223ad54]
# to [8fe7bc6a02c45a082c01486d4d9fb50ff08c7ad5]
#
# patch "packages/libsdl/libsdl.inc"
# from [ef7bae28505a44d0e047eb8721e4850acb2e495e]
# to [6258bba8622d9737eadd0bbde8935f1438db37c6]
#
# patch "packages/libtomcrypt/libtomcrypt_1.17.bb"
# from [3402d7398b04139518b06b8a2b1b5c3706ff9977]
# to [35f3eaae8f6022c26e9a249282808e9e8cdf8575]
#
# patch "packages/linux/linux-2.6.24/mpc8313e-rdb/defconfig"
# from [513031550df4c84414c69b00aeea62dd5b61825c]
# to [0b75d9d74fd82e3a550b805465eea4d9532530a5]
#
# patch "packages/linux/linux-davinci/davinci-sffsdr/defconfig"
# from [d76344cf2dccb9b3b92feb9643ac3df9f0182d91]
# to [4df55e9222bbc1baee2a2743820e24de5b910ac8]
#
# patch "packages/linux/linux-davinci_2.6.x+git-davinci.bb"
# from [52f3d3b0d626d28fcb41b051eb1d474d8317f0f1]
# to [1ac416bdfaa26fe04872b69e10527d05b0f767e7]
#
# patch "packages/linux/linux-omap2-git/beagleboard/defconfig"
# from [2f05b3e1110f33d603ff766c5f6eaa3de119b09c]
# to [02605ee04fd077507884635c969aef185e51c9a9]
#
# patch "packages/linux/linux-omap2_git.bb"
# from [54e881f43e88f1a9e7f204f4b384d8156014bd07]
# to [26a0064325df33b3d39788cdff0fcc63dd1f5639]
#
# patch "packages/linux/linux_2.6.24.bb"
# from [1698797d4e832dd0ac53b480d89c620c02d4add1]
# to [5819d62f743069d615e51ce38e88a46104232fd3]
#
# patch "packages/swt/swt-gtk.inc"
# from [63792d964f1f171ba6f802dc502978513888f9d1]
# to [34ce8d11fb9f91b158bc4c9b563ee476e7e9af97]
#
# patch "packages/swt/swt3.3-gtk_3.3.1.bb"
# from [ac1e6656f8358a0ce3928cd18fcdc21d2d36511e]
# to [1316c4c5234703233997ae43f461c3dbf00edc9f]
#
# patch "packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb"
# from [8dd921847bcbe0395c0edf0aefecd834ec3d7191]
# to [8afa34d71a75484e91ee61f5b889b645a0435a57]
#
# patch "packages/swt/swt3.4-gtk-hildon_3.3+3.4M5.bb"
# from [3916433c0bdcdb906ba537ccf470b67f134ff0bf]
# to [569de3e1f4555130a36384e36cc7aa658d2aef9d]
#
# patch "packages/swt/swt3.4-gtk_3.3+3.4M3.bb"
# from [a779adf603545ff091c4414cb8912b456679c9f6]
# to [73232c0b9e0b3ec716fdf920c4be653dcb7fd613]
#
# patch "packages/swt/swt3.4-gtk_3.3+3.4M5.bb"
# from [49299001965c29d520d50104199531c9d47f72dc]
# to [0cbecf9ad22346931fc40901ade6bee845011827]
#
# set "contrib/angstrom/sort.sh"
# attr "mtn:execute"
# value "true"
#
============================================================
--- contrib/angstrom/sort.sh 3c83857daf315ecca0771eff753f8ddb557f0002
+++ contrib/angstrom/sort.sh 3c83857daf315ecca0771eff753f8ddb557f0002
@@ -0,0 +1,145 @@
+#!/bin/bash
+
+# Angstrom feed sorting script
+# This must be run in unstable/ directory
+
+rm Packages* >& /dev/null
+
+# Find ipkg files in unsorted/ and remove stale ones
+echo "Deleting morgue directories "
+find . -name morgue | xargs rm -rf
+echo "Moving packages to the top level directory"
+find */ -name "*.ipk" -exec mv '{}' ./ \;
+
+# Make a list of ipkg files already present in feeds and in unsorted
+echo "Making a list of unsorted packages"
+for i in $(find . -name "*.ipk") ; do basename $i ; done > files-unsorted
+if [ "$1" != "--skip-sorted-list" ]; then
+ echo "Making a list of sorted packages (takes long)"
+ for i in $(find ../ -name "*.ipk"| grep -v unsorted) ; do basename $i ; done > files-sorted
+fi
+
+# Make a list of duplicates and delete those
+echo "Finding duplicate packages in unsorted"
+cat files-sorted files-unsorted | sort | uniq -d > files-duplicate
+echo "Removing duplicate packages in unsorted"
+cat files-duplicate | xargs rm -f
+
+# Log remaining packages to a file
+find . -name "*.ipk" |grep -v dbg | grep -v -- -dev | grep -v -- -doc | grep -v angstrom-version | grep -v locale > new-files.txt
+for newfile in $(cat new-files.txt | sed s:./::g) ; do
+ echo "$(date -u +%s) $newfile $(basename ${PWD})" >> ../upload.txt
+done
+
+do_sort() {
+archdir=$arch
+
+case "$arch" in
+ "arm-oabi")
+ machines="h3600 h3800 collie simpad htcwallaby" ;;
+ "armv4t")
+ machines="ep93xx h6300 om-gta01 om-gta02 fic-gta01 fic-gta02" ;;
+ "armv5te")
+ machines="davinci-dvevm gumstix-connex gumstix-verdex gumstix e680 a780 a1200 at91sam9263ek rokre6 rokre2 rokr-e2 akita c7x0 h2200 h3900 h4000 h5000 htcapache htctornado htcblueangel htcuniversal hx4700 nslu2le hx2000 ixp4xxle magician netbook-pro nokia770 palmld palmtx palmtt3 palmz72 qemuarm omap5912osk poodle spitz tosa" ;;
+ "armv5teb")
+ machines="ixp4xxbe nslu2be" ;;
+ "armv6")
+ machines="mx31ads nokia800 davinci-sffsdr" ;;
+ "armv7")
+ machines="" ;;
+ "armv7a")
+ machines="beagleboard" ;;
+ "avr32")
+ machines="atngw100 at32stk1000" ;;
+ "bfin")
+ archdir="blackfin"
+ machines="adsp-bf537-stamp" ;;
+ "geode")
+ machines="alix" ;;
+ "i486")
+ machines="x86" ;;
+ "i586")
+ machines="epia qemux86" ;;
+ "i686")
+ machines="guinness progear" ;;
+ "iwmmxt")
+ machines="" ;;
+ "ppc405")
+ machines="dht-walnut" ;;
+ "ppc603e")
+ machines="efika" ;;
+ "sparc")
+ machines="" ;;
+esac
+
+echo "Sorting $arch"
+for i in `find . -name "*.ipk"| grep $arch` ; do mkdir -p ../$archdir/base/ || true ;mv $i ../$archdir/base/ ; done
+ for machine in $machines ; do
+ for i in `find . -name "*_$machine.ipk"| grep $machine` ; do mkdir -p ../$archdir/machine/$machine || true ;mv $i ../$archdir/machine/$machine ; done
+ done
+(cd ../$archdir && do_index )
+
+}
+
+do_index() {
+ipkg_tools_path="/usr/local/bin"
+echo "Processing $(basename $PWD) packages...."
+
+BPWD=`pwd`
+
+cd base
+
+mkdir -p ../debug ../perl ../python ../gstreamer ../locales/en || true
+
+#split the feeds based on names
+mv python* ../python/ >& /dev/null
+mv perl* ../perl/ >& /dev/null
+mv *-dbg* ../debug/ >& /dev/null
+mv gst* ../gstreamer >& /dev/null
+
+for i in ../* ; do
+ if [ -d $i ]; then
+ cd $i
+ echo -n "building index for $i:" |sed s:\.\./::
+ ${ipkg_tools_path}/ipkg-make-index -p Packages -l Packages.filelist -m -L ../locales . >& /dev/null
+ echo " DONE"
+ fi
+done
+cd ${BPWD}/machine
+
+for i in ./* ; do
+ if [ -d $i ]; then
+ cd $i
+ echo -n "building index for machine $i:"
+ ${ipkg_tools_path}/ipkg-make-index -p Packages -l Packages.filelist -m . >& /dev/null
+ echo " DONE"
+ cd ../
+ fi
+done
+
+cd ${BPWD}/locales/en/
+echo -n "building index for locales:"
+for i in ../* ; do
+ if [ -d $i ]; then
+ echo -n " $i" |sed s:\.\./::
+ ${ipkg_tools_path}/ipkg-make-index -p Packages -l Packages.filelist -m . >& /dev/null;
+ cd $i
+ fi
+ done
+echo " DONE"
+cd ${BPWD}
+
+echo -n "Stripping source lines from Package files"
+for i in `find . -name Packages` ; do grep -v ^Source: $i|gzip -c9>$i.gz ;gunzip -c $i.gz>$i ; done
+echo " DONE"
+}
+
+echo "Processing 'all' feed"
+for i in `find . -name "*.ipk"| grep _all` ; do mkdir -p ../all/ || true ;mv $i ../all/ ; done
+ (cd ../all && ipkg-make-index -p Packages -m . >& /dev/null)
+
+for arch in arm-oabi armv4t armv5teb armv5te armv6 armv7a armv7 avr32 bfin geode i486 i586 i686 iwmmxt ppc405 ppc603e sparc ; do
+ do_sort
+done
+
+(cd ~/website/repo ; php update.php)
============================================================
--- packages/klibc/files/wc.patch 91dc314c8c1ad42f06a34d17214e5f6b6ee17b41
+++ packages/klibc/files/wc.patch 91dc314c8c1ad42f06a34d17214e5f6b6ee17b41
@@ -0,0 +1,236 @@
+Index: klibc-1.5/usr/utils/Kbuild
+===================================================================
+--- klibc-1.5.orig/usr/utils/Kbuild 2008-04-14 23:21:57.702294843 +0200
++++ klibc-1.5/usr/utils/Kbuild 2008-04-14 23:24:38.817291977 +0200
+@@ -3,7 +3,7 @@
+ #
+
+ progs := chroot dd mkdir mkfifo mknod mount pivot_root umount
+-progs += true false sleep ln nuke minips cat losetup
++progs += true false sleep ln nuke minips cat losetup wc
+ progs += insmod uname halt kill readlink cpio modprobe
+
+ static-y := $(addprefix static/, $(progs))
+@@ -56,6 +56,9 @@
+ shared/modprobe-y := modprobe.o
+ static/losetup-y := losetup.o
+ shared/losetup-y := losetup.o
++static/wc-y := wc.o
++shared/wc-y := wc.o
++
+ # Additionally linked targets
+ always := static/reboot static/poweroff shared/reboot shared/poweroff
+
+Index: klibc-1.5/usr/utils/wc.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ klibc-1.5/usr/utils/wc.c 2008-04-14 23:25:15.449292711 +0200
+@@ -0,0 +1,208 @@
++/* vi: set sw=4 ts=4: */
++/*
++ * wc implementation for busybox
++ *
++ * Copyright (C) 2003 Manuel Novoa III <mjn3 at codepoet.org>
++ *
++ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
++ */
++
++/* BB_AUDIT SUSv3%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list