summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2009-02-07 17:03:23 -0800
committerKhem Raj <raj.khem@gmail.com>2009-02-07 17:03:23 -0800
commit8a022299d8cbe2de444669a5a25b1f1c182d86f2 (patch)
tree0801f6ef6d9ccf2edbfc67a10efa10ffd611df8f
parentff830a30aca98928bcd5ea6726e3b3064785f506 (diff)
parentd6bc6a6e31509a9175bdb3636b3fbed89f794986 (diff)
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
-rw-r--r--conf/checksums.ini40
-rw-r--r--conf/distro/include/sane-srcrevs.inc11
-rw-r--r--conf/machine/h2200.conf1
-rw-r--r--conf/machine/hx4700.conf1
-rwxr-xr-xcontrib/angstrom/build-feeds.sh4
-rwxr-xr-xcontrib/angstrom/build-release.sh17
-rwxr-xr-xcontrib/angstrom/sort.sh3
-rw-r--r--contrib/angstrom/upload-packages.sh3
-rw-r--r--contrib/feed-browser/index.html47
-rw-r--r--contrib/feed-browser/index.php108
-rw-r--r--contrib/feed-browser/scripts/js/repo.js130
-rw-r--r--contrib/feed-browser/section.php85
-rw-r--r--packages/angstrom/angstrom-gpe-task-settings.bb5
-rw-r--r--packages/apr/apr-util/configure_fixes.patch20
-rw-r--r--packages/apr/apr-util_1.2.12.bb12
-rw-r--r--packages/byacc/byacc-native_20081225.bb5
-rw-r--r--packages/byacc/byacc.inc13
-rw-r--r--packages/byacc/byacc_20081225.bb3
-rw-r--r--packages/clutter/clutter.inc4
-rw-r--r--packages/connman/connman-gnome_0.4.bb13
-rw-r--r--packages/connman/connman.inc4
-rw-r--r--packages/connman/connman_0.10.bb4
-rw-r--r--packages/connman/files/connman-applet.desktop10
-rw-r--r--packages/connman/files/phrase-lenght.diff23
-rw-r--r--packages/console-tools/console-tools_0.3.2.bb5
-rw-r--r--packages/eglibc/eglibc-package.bbclass38
-rw-r--r--packages/eglibc/eglibc_2.9.bb2
-rw-r--r--packages/eglibc/eglibc_svn.bb2
-rw-r--r--packages/freesmartphone/fso-abyss_git.bb18
-rw-r--r--packages/gdb/gdbserver_6.8.bb1
-rw-r--r--packages/gtk+/gdk-pixbuf-csource-native_2.12.11.bb1
-rw-r--r--packages/gtk+/gtk+_2.14.2.bb7
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig2
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig2
-rw-r--r--packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb2
-rw-r--r--packages/mumpot/files/mumpot-cyclemap.desktop2
-rw-r--r--packages/mumpot/files/mumpot-mapnik.desktop2
-rw-r--r--packages/mumpot/files/mumpot-tah.desktop2
-rw-r--r--packages/mumpot/mumpot_0.3.1.bb18
-rw-r--r--packages/mumpot/mumpot_0.4.bb (renamed from packages/mumpot/mumpot_0.3.2.bb)0
-rw-r--r--packages/powervr-drivers/libgles-omap3.inc15
-rwxr-xr-xpackages/powervr-drivers/libgles-omap3/rc.pvr4
-rw-r--r--packages/powervr-drivers/libgles-omap3_3.00.00.05.bb4
-rw-r--r--packages/powervr-drivers/libgles-omap3_3.00.00.06.bb3
-rw-r--r--packages/python/divmod.inc17
-rw-r--r--packages/python/python-coherence_0.6.0.bb2
-rw-r--r--packages/python/python-coherence_svn.bb19
-rw-r--r--packages/python/python-divmodepsilon_0.5.11.bb7
-rw-r--r--packages/python/python-elementtree_1.2.7-20070827-preview.bb14
-rw-r--r--packages/python/python-gdata_1.2.4.bb15
-rw-r--r--packages/python/python-nevow_0.9.32.bb10
-rw-r--r--packages/python/python-pycairo_1.4.0.bb2
-rw-r--r--packages/python/python-pycairo_1.8.0.bb2
-rw-r--r--packages/python/python-twisted-native_8.2.0.bb7
-rw-r--r--packages/python/python-xappy_0.5.bb2
-rw-r--r--packages/serial-utils/pty-forward-native.bb11
-rw-r--r--packages/serial-utils/serial-forward.bb12
-rw-r--r--packages/tasks/task-beagleboard-demo.bb3
-rw-r--r--packages/xorg-lib/pixman/pixman-0.13.2-neon1.patch54
-rw-r--r--packages/xorg-lib/pixman_0.13.2.bb2
60 files changed, 645 insertions, 230 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 50307c482a..3a129b7924 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -94,6 +94,10 @@ sha256=8f9124bd76c378ae2a25b6b421ebb8f0a88069da697ac6c96943571d93af8b15
md5=8bd2a92fb94faa1b4fc43865d40bd988
sha256=a317cd11719659892bdae6ec54ee2e37549d0df7d5bdce02036963acc2ad1486
+[http://divmod.org/trac/attachment/wiki/SoftwareReleases/Axiom-0.5.30.tar.gz?format=raw]
+md5=8f0b3a27770e487ad08f4fafdccc4495
+sha256=4a4217e70e01e11d357c2c2c23bc72d244a78fa40a401cca48cd5f0a619c7060
+
[http://search.cpan.org/CPAN/authors/id/D/DC/DCLINTON/Cache-Cache-1.05.tar.gz]
md5=09e4d37979c8f8ce2518e1d1ccd10d99
sha256=10106d94e0897c18cd5eb0b782c3212371c9785eba78a15f4623335e01dda23c
@@ -210,6 +214,10 @@ sha256=4c780b9e2906944ce02a9325b15f480d2bd4c0b12137f752aa4800c0f8563acf
md5=3bf4d8d285591a5b7f31170f9b87aba0
sha256=c196988f55fc6633d9f9f6d9ddc2ae9b4dfa1f300edf4cbbad865c06a8656df7
+[http://divmod.org/trac/attachment/wiki/SoftwareReleases/Epsilon-0.5.11.tar.gz?format=raw]
+md5=39710dfdeb42e51c953b17b6cded163e
+sha256=a5907a3b7584d63be30b3f79b0422b2b0778e73c053be9ac5a11004f1c9097dc
+
[http://search.cpan.org/CPAN/authors/id/P/PE/PEVANS/Error-0.17004.tar.gz]
md5=4dfca8732331a4f79c6803c3bc6b722f
sha256=f464f0068772c276b81a7345f6788bdc3a243c13de24563346043d049a5497ba
@@ -514,6 +522,10 @@ sha256=4ba65d64599ca6937b44b98d1efd04957278679ddd733081d0d8c2ecf6c0143b
md5=64f780e7f95c252eaaed0201c3d9a4ca
sha256=281234116b99b4c4b45fde038a435a0d26b7ee55beac0c351186b3f12c301659
+[http://divmod.org/trac/attachment/wiki/SoftwareReleases/Nevow-0.9.32.tar.gz?format=raw]
+md5=75828090af2b26f69fe4a7f148a400f6
+sha256=bc35ce187481db91f047055b3edbce49c14d291b1a2eb3e915e9c1c511620f9a
+
[http://downloads.sourceforge.net/numpy/Numeric-23.7.tar.gz]
md5=8054781c58ae9cf6fe498316860b5ea8
sha256=33225097777e84dfed251aee1265a9c0dd0976854e83f60e778a670027b12e7c
@@ -2158,6 +2170,10 @@ sha256=1b4a5b5e48ad5e61a21586b7b59d5c0a88691a981e73e2c6dc5868197461791b
md5=b12426fd72bedf00c389a7fb458275a8
sha256=5a4a5b82dd8f485b4fef941cc216eb052184cf138f72b512eb62d836b460acdb
+[http://downloads.sourceforge.net/bftpd/bftpd-2.3.tar.gz]
+md5=4ab1eb33135fa5eaaf050e6d3dd0b319
+sha256=0af27ca6c49f696c64bcfb3e50452cad240997993e0b7afb65624898d3d95ff2
+
[http://download.blender.org/peach/bigbuckbunny_movies/big_buck_bunny_480p_surround-fix.avi]
md5=ed7ed01e9aefba8ddd77c13332cec120
sha256=40d1cf5bc8e1b0e55dac7bb2e3fbc2aea05b6679444864781299b24db044634f
@@ -2806,6 +2822,10 @@ sha256=624381208d0faae6c123bc6198a59d6c4316cd4fffb1ba5aca206374f5a42df6
md5=53c44b73aa67d5e0282adfe928f3ba44
sha256=624381208d0faae6c123bc6198a59d6c4316cd4fffb1ba5aca206374f5a42df6
+[ftp://invisible-island.net/byacc/byacc-20081225.tgz]
+md5=b9715b9a2867c221176b597e8f73cbc9
+sha256=1364c7fe382de659e8b9841a1736b645345a460d2f4302303e80c02235a2a575
+
[http://downloads.sourceforge.net/bzflag/bzflag-1.10.6.20040515.tar.bz2]
md5=8e3e5fbef3cfa21079eb06269e6b3d8b
sha256=0329e3d0a59e9cc167733ed2b89a0dc2249725642a065cfd385bf1206fe30b19
@@ -3426,6 +3446,10 @@ sha256=1d56be1036de59926548e3defa4b9af894af9e2121d3598da13769da5c0f55b1
md5=094743343e062ea370fcd461aa48a7fe
sha256=bba3adf21a59f5836b1ba2615894e891627d9bcc863525f1892bc36e4e76124e
+[http://repo.moblin.org/connman/releases/connman-0.10.tar.gz]
+md5=094743343e062ea370fcd461aa48a7fe
+sha256=bba3adf21a59f5836b1ba2615894e891627d9bcc863525f1892bc36e4e76124e
+
[ftp://ftp.moblin.org/connman/releases/connman-0.2.tar.gz]
md5=bf48aa07d3c1e5fe272c7f139bc01fc9
sha256=eacc3c57cffb411b09d834d2225323cde5676165b5d2fc2a27b16cde98e3ba97
@@ -3446,6 +3470,10 @@ sha256=9c626bda7e2cc460cdbfe9a14c13208253de6922a341ef60ba51a673c0317996
md5=c9a3b384f080ed4cdf139ce9377ef2c8
sha256=d7acac8bc0a38dfcab098137a76f5e9f4ce30ca86e82b26540502658e6b4e4a7
+[http://repo.moblin.org/connman/releases/connman-gnome-0.4.tar.gz]
+md5=c9a3b384f080ed4cdf139ce9377ef2c8
+sha256=d7acac8bc0a38dfcab098137a76f5e9f4ce30ca86e82b26540502658e6b4e4a7
+
[http://www.conserver.com/conserver-8.1.14.tar.gz]
md5=f7825728e5af8992ed4a99fb560a3df8
sha256=48a9e2f8a02054bc6740ae354433bfa1636a6e726f2d62af22752d7a6103410b
@@ -4650,6 +4678,10 @@ sha256=fefd63c13ca28713f7f03320c1e341430ea2d016d3ab3e49163a12f4df2123e7
md5=ec8690ff84b364d2df5b2443a01ba529
sha256=e0360be0eecee68649246c022825dd5422f895958ffa736886dd2a0b9ec7ebda
+[http://effbot.org/media/downloads/elementtree-1.2.7-20070827-preview.zip]
+md5=30e2fe5edd143f347e03a8baf5d60f8a
+sha256=5071431068c58c1f56dcc8fff37f8a213351f3b45c012d3adb640ec9418053ad
+
[http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/elfutils-0.108.tar.gz]
md5=fd318a634c8f67c7ac8a975f16965cc3
sha256=794070c8108a2d8b7c6890ba42edb37510cc845bf601517cf4a0ea5443dfde29
@@ -6402,6 +6434,10 @@ sha256=00f2b73fea5eff79ae26338928187f956427421bc70ddab0ab63fe5a58112b87
md5=1939de5fe43d12884d85fa5d7797e3c2
sha256=243dabf3c45530cac8be092f9a1d838a46b46a92d4138870423006ffd6ae4001
+[http://gdata-python-client.googlecode.com/files/gdata.py-1.2.4.tar.gz]
+md5=521f33a377d64f8a6505ba119415b787
+sha256=fc5ddb8f76b17abd728721a0e0177ea35f55a70106f44dc9010b22eceb06abde
+
[ftp://ftp.gnu.org/gnu/gdb/gdb-6.3.tar.gz]
md5=812de9e756d53c749ea5516d9ffa5905
sha256=c06bf9715436b3a28c189163aa5ca42b46af8286659827f033eaaf7d8b1fc342
@@ -15290,6 +15326,10 @@ sha256=c1454fdf5d3658f492253106c12bbf89a3bcc5789c36851a5f2f345d61a4ac0c
md5=115dc5380ffdb03ec2e71ff9d6d97e72
sha256=50bfab6d4b1b9af37ca6832b979f5c891f2dd9259a68700b37214d7897927c17
+[http://www.mumpot.org/download/mumpot-0.4.tar.gz]
+md5=52d1e64c63d70604f13985f1f326a802
+sha256=302bea9f0903fecf13ee0e9c24ed090203f2c77f7164a2a0f68c35fc8e1b9f10
+
[http://www.dotaster.com/~shuu/linux/murasaki/0.8/8/murasaki-0.8.8.tar.gz]
md5=ea7afa7e0bd9cfa0df7c04a9b270df88
sha256=2033168723ffd612336acb8a64b33fcd91f7dedeaf78949d3dfce231cb962ce9
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index be7a9faba1..711c0f74d6 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -43,6 +43,7 @@ SRCREV_pn-exalt ?= "79"
SRCREV_pn-exalt-daemon ?= "78"
SRCREV_pn-exalt-module ?= "78"
SRCREV_pn-ezx-boot-usb-native ?= "2371"
+SRCREV_pn-ezx-gen-blob ?= "2390"
SRCREV_pn-ezxd ?= "2074"
SRCREV_pn-elf2flt ?= "1786"
SRCREV_pn-epiphany ?= "7837"
@@ -53,6 +54,7 @@ SRCREV_pn-flashrom ?= "3682"
SRCREV_pn-frameworkd ?= "700ab8250582767628165b7cf6f671ef756ba56d"
SRCREV_pn-frameworkd-devel ?= "${SRCREV_pn-frameworkd}"
SRCREV_pn-fsod ?= "3fa5eb6f2edcf7c9f0fc2027fda47b91d9f0f136"
+SRCREV_pn-fso-abyss ?= "b8430f9e8898dae390191fb114904f13583043f5"
SRCREV_pn-fso-apm ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa"
SRCREV_pn-fso-gpsd ?= "78fe48dffb923175bde9f0aabc3500a9264a57e0"
SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4"
@@ -171,7 +173,7 @@ SRCREV_pn-openmoko-theme-standard2 ?= "4338"
SRCREV_pn-openmoko-theme-standard2-qvga ?= "3425"
SRCREV_pn-openmoko-today2 ?= "4168"
SRCREV_pn-openmoko-today2-folders ?= "3704"
-SRCREV_pn-openmoko-toolchain-scripts ?= "4878"
+SRCREV_pn-openmoko-toolchain-scripts ?= "4913"
SRCREV_pn-openmoko-worldclock2 ?= "3365"
SRCREV_pn-openocd ?= "517"
SRCREV_pn-openocd-native ?= "517"
@@ -185,12 +187,13 @@ SRCREV_pn-packagekit ?= "813fa8cfb139246cf180d52895b52b28616ae2f5"
SRCREV_pn-paroli ?= "9279b50ed72a94100d7f0f49090043134302f2eb"
SRCREV_pn-portaudio-v19 ?= "1387"
SRCREV_pn-psplash ?= "249"
-SRCREV_pn-pty-forward-native ?= "4214"
+SRCREV_pn-pty-forward-native ?= "4907"
SRCREV_pn-pyefl-sudoku ?= "49"
SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141"
SRCREV_pn-pylgrim ?= "20"
SRCREV_pn-pyneod ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a"
SRCREV_pn-pyneog ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a"
+SRCREV_pn-python-coherence ?= "1154"
SRCREV_pn-python-connexion ?= "1439"
SRCREV_pn-python-formencode ?= "3148"
SRCREV_pn-python-gsmd ?= "148"
@@ -205,7 +208,7 @@ SRCREV_pn-qi ?= "ed52486b43dca91891305b9e832c8366a2742798"
SRCREV_pn-remoko ?= "121"
SRCREV_pn-remoko-server ?= "121"
SRCREV_pn-s3c24xx-gpio ?= "4130"
-SRCREV_pn-serial-forward ?= "4214"
+SRCREV_pn-serial-forward ?= "4907"
SRCREV_pn-settings-daemon ?= "2006"
SRCREV_pn-sjf2410-linux-native ?= "4268"
SRCREV_pn-socketcan-modules ?= "917"
@@ -222,7 +225,7 @@ SRCREV_pn-uclibc ?= "24279"
SRCREV_pn-uclibc-initial ?= "24279"
SRCREV_pn-usbpath ?= "3172"
SRCREV_pn-usbpath-native ?= "3172"
-SRCREV_pn-vala-terminal ?= "502d62d7eb100f86380b0e78474cc360ad7944b5"
+SRCREV_pn-vala-terminal ?= "94117f453ce884e9c30b611fae6fc19f85f98f2b"
SRCREV_pn-webkit-gtk ?= "39964"
SRCREV_pn-webkit-qt ?= "28656"
SRCREV_pn-webkit-qtopia ?= "28656"
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index 6ccdc5070e..abc17728b5 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -45,5 +45,4 @@ module_autoload_g_ether = "g_ether"
SERIAL_CONSOLE = "115200 ttyS0 vt100"
USE_VT = "0"
-IMAGE_DEVICE_TABLES = "device_table-oldmmc.txt"
require conf/machine/include/LAB-settings.inc
diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index 4906f87e76..ab532e33ff 100644
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -73,5 +73,4 @@ module_autoload_pxa27x_udc = "pxa27x_udc"
#FIXME: this should be controlled by a userspace utility later.
module_autoload_g_ether = "g_ether"
-IMAGE_DEVICE_TABLES = "device_table-oldmmc.txt"
SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index 6b73a2af42..5414aa9796 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -238,6 +238,7 @@ do
pushover \
python \
python-pybluez \
+ python-coherence \
qfish2 \
qmatrix \
qpe-nmap \
@@ -340,7 +341,8 @@ done
# machine packages (machine specific (sub)packages)
-for machine in beagleboard omap3evm neuros-osd2 efika dht-walnut palmt650 omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad om-gta01 om-gta02 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700 nokia800 dns323 mv2120 kuropro lspro tsx09 ts409 qemux86
+for machine in overo omap3-pandora beagleboard omap3evm neuros-osd2 efika dht-walnut palmt650 omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad om-gta01 om-gta02 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700 nokia800 dns323 mv2120 kuropro lspro tsx09 ts409 qemux86
+
do
BUILD_MACHINE=$machine
BUILD_CLEAN="opkg-native qmake-native qmake2-native qt-x11-free python python-native python-pygtk gnome-icon-theme"
diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh
index 1668717cd3..d8144f80e4 100755
--- a/contrib/angstrom/build-release.sh
+++ b/contrib/angstrom/build-release.sh
@@ -86,7 +86,7 @@ do
done
# build kexecboot kernels for supported machines
-for machine in poodle collie
+for machine in h2200 hx4700 c7x0 akita spitz poodle collie
do
BUILD_MACHINE=$machine
BUILD_TARGETS="linux-kexecboot"
@@ -94,17 +94,8 @@ do
done
-# Make uclibc initramfs-bootmenu-image for ipaqs, this should move to more generic klibc stuff, but till then:
-DO_UCLIBC=1
-for machine in h2200 h3900 h4000 h5000 hx4700
-do
- BUILD_MACHINE=$machine
- BUILD_TARGETS="initramfs-bootmenu-image"
-done
-DO_UCLIBC=0
-
# graphics, flash storage
-for machine in beagleboard omap3evm om-gta01 om-gta02 a780 at91sam9263ek qemuarm qemux86 h2200 h3900 h4000 h5000 poodle tosa hx4700 c7x0 spitz akita collie simpad
+for machine in overo omap3-pandora beagleboard omap3evm om-gta01 om-gta02 a780 at91sam9263ek qemuarm qemux86 h2200 h3900 h4000 h5000 poodle tosa hx4700 c7x0 spitz akita collie simpad
do
BUILD_CLEAN="base-files"
BUILD_MACHINE=$machine
@@ -113,7 +104,7 @@ do
done
# graphics, disk storage
-for machine in spitz beagleboard omap3evm
+for machine in spitz overo omap3-pandora beagleboard omap3evm
do
BUILD_CLEAN="base-files"
BUILD_MACHINE=$machine
@@ -130,7 +121,7 @@ do
done
# omap3 boards
-for machine in beagleboard omap3evm
+for machine in overo omap3-pandora beagleboard omap3evm
do
BUILD_MACHINE=$machine
BUILD_TARGETS="beagleboard-demo-image"
diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh
index 94b8cb6d1a..d624000d17 100755
--- a/contrib/angstrom/sort.sh
+++ b/contrib/angstrom/sort.sh
@@ -144,6 +144,8 @@ for i in ../* ; do
echo " DONE"
cd ${BPWD}
+( cd ~/website/repo-updater ; php update.php ; rm ../repo/feeds.db* ; cp feeds.db* ../repo )
+
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 ; touch $i.sig ; done
echo " DONE"
@@ -162,4 +164,3 @@ if [ "$1" != "--skip-sorted-list" ]; then
for i in $(find ../ -name "*.ipk"| grep -v unsorted) ; do basename $i ; done > files-sorted
fi
-( cd ~/website/repo-updater ; php update.php ; rm ../repo/feeds.db* ; cp feeds.db* ../repo )
diff --git a/contrib/angstrom/upload-packages.sh b/contrib/angstrom/upload-packages.sh
index 4d3362b6d2..1ae7086cab 100644
--- a/contrib/angstrom/upload-packages.sh
+++ b/contrib/angstrom/upload-packages.sh
@@ -31,6 +31,9 @@ echo "Checking for duplicates"
cat files-remote files-local | sort | uniq -u >files-uniq
cat files-uniq files-local | sort | uniq -d > files-trans
+# Remove SGX files
+rm -f upload-queue/*3.00.*
+
# Copy over non-duplicate files
echo "Starting rsync..."
rsync -vz --copy-links --progress --files-from=files-trans upload-queue/ $REMOTEM:$REMOTED/unsorted/
diff --git a/contrib/feed-browser/index.html b/contrib/feed-browser/index.html
new file mode 100644
index 0000000000..08b1d9a804
--- /dev/null
+++ b/contrib/feed-browser/index.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+ <head>
+ <title>Feed browser</title>
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <style type="text/css" media="all">@import "css/feed.css";</style>
+ <script language="javascript" type="text/javascript" src="scripts/js/repo.js"></script>
+ </head>
+ <body onLoad=" qs(); getLetter(); getSection();">
+ <div id="right">
+ <div id="searchletter"</div>
+ <form name="pkg_query" onsubmit="javascript:pkgQuery();return false"">
+ <fieldset>
+ <label for="name">Package name</label>
+ <input id="pkgsearch" type="text" name="pkgsearch" value="" />
+ <select name="arch">
+ <option value="" selected="selected">all architectures</option>
+ <option value="all">no arch</option>
+<?php
+
+foreach($archs_list as $architecture)
+{
+ echo "<option value='{$architecture['p_arch']}'";
+
+ if($architecture['p_arch'] == $arch)
+ {
+ echo ' selected="selected"';
+ }
+ echo ">{$architecture['p_arch']}</option>";
+}
+
+?>
+
+
+ </select>
+ <input type="submit" value="Search" />
+ </fieldset>
+ </form>
+ <div id="opkgoutput"><?php echo $ipkgoutput; ?></div>
+ </div>
+ <div id="left">
+ <h1>Sections list</h1>
+ <div id="sectionslist"></div>
+ </div>
+ </body>
+</html>
diff --git a/contrib/feed-browser/index.php b/contrib/feed-browser/index.php
deleted file mode 100644
index eca57e9269..0000000000
--- a/contrib/feed-browser/index.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-/*
- * (c) Koen Kooi 2006, 2007
- * (c) Marcin Juszkiewicz 2006, 2007
- *
- * This php script is intended to do the following:
- *
- * - have searchable webfronted for the feed like packages.ubuntu.com
- *
- * ToDo:
- *
- * - search functionality
- * - provide feed-management functionality
- * - allow uploading of new software
- *
- *
- * 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.
- *
- * 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 Library General Public License along
- * with this library; see the file COPYING.LIB. If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
- *
- */
-
-require_once 'includes/config.inc';
-require_once 'includes/functions.inc';
-
-if(!check_database())
-{
- die("Database not found and cannot be created.");
-}
-
-read_vars_from_get(array('name', 'arch', 'pkgsearch', 'letter', 'pkgname', 'section'));
-
-$ipkgoutput = '';
-
-if(!empty($section))
-{
- $ipkgoutput = searchsection($section);
-}
-elseif(!empty($letter))
-{
- $ipkgoutput = searchpkg("{$letter}%", $arch);
-}
-elseif(!empty($pkgname))
-{
- $ipkgoutput = pkgdetails($pkgname);
-}
-elseif(!empty($pkgsearch) OR !empty($arch))
-{
- $ipkgoutput = searchpkg("%{$pkgsearch}%", $arch);
-}
-
-$archs_list = get_arch_list();
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
- <head>
- <title>Feed browser</title>
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <style type="text/css" media="all">@import "css/feed.css";</style>
- </head>
- <body >
- <div id="right">
- <?php echo searchletter(); ?>
- <form action="" method="get">
- <fieldset>
- <label for="name">Package name</label>
- <input type="text" name="pkgsearch" value="<?php echo $pkgsearch; ?>" />
- <select name="arch">
- <option value="" selected="selected">all architectures</option>
- <option value="all">no arch</option>
-<?php
-
-foreach($archs_list as $architecture)
-{
- echo "<option value='{$architecture['p_arch']}'";
-
- if($architecture['p_arch'] == $arch)
- {
- echo ' selected="selected"';
- }
- echo ">{$architecture['p_arch']}</option>";
-}
-
-?>
- </select>
- <input type="submit" value="Search" />
- </fieldset>
- </form>
- <?php echo $ipkgoutput; ?>
- </div>
- <div id="left">
- <h1>Sections list</h1>
- <?php echo sectionslist(); ?>
- </div>
- </body>
-</html>
diff --git a/contrib/feed-browser/scripts/js/repo.js b/contrib/feed-browser/scripts/js/repo.js
new file mode 100644
index 0000000000..edd1fd503e
--- /dev/null
+++ b/contrib/feed-browser/scripts/js/repo.js
@@ -0,0 +1,130 @@
+/* The following function creates an XMLHttpRequest object... */
+
+function createRequestObject(){
+ var request_o; //declare the variable to hold the object.
+ var browser = navigator.appName; //find the browser name
+ if(browser == "Microsoft Internet Explorer"){
+ /* Create the object using MSIE's method */
+ request_o = new ActiveXObject("Microsoft.XMLHTTP");
+ } else {
+ /* Create the object using other browser's method */
+ request_o = new XMLHttpRequest();
+ }
+ return request_o; //return the object
+}
+
+/* The variable http will hold our new XMLHttpRequest object. */
+var sectionHTTP = createRequestObject();
+var queryHTTP = createRequestObject();