Merge branch 'vuplus-1.6' of 192.168.102.66:/var/ikseong/repo/openembedded into vuplu...
authorschon <schon@dev03-server>
Thu, 17 Mar 2011 02:07:11 +0000 (11:07 +0900)
committerschon <schon@dev03-server>
Thu, 17 Mar 2011 02:07:11 +0000 (11:07 +0900)
80 files changed:
conf/checksums.ini
conf/machine/dm500hd.conf
conf/machine/dm7020hd.conf
conf/machine/dm7025.conf
conf/machine/dm800.conf
conf/machine/dm8000.conf
conf/machine/dm800se.conf
recipes/autofs/autofs-4.1.4/autofs
recipes/autofs/autofs_4.1.4.bb
recipes/busybox/busybox-1.15.3/devfsd.conf [new file with mode: 0644]
recipes/busybox/busybox-1.15.3/opendreambox/defconfig
recipes/busybox/busybox_1.15.3.bb
recipes/dreambox/dreambox-bootlogo.bb
recipes/dreambox/dreambox-dvb-modules.bb
recipes/dreambox/dreambox-dvb-tools-v3.bb
recipes/dreambox/dreambox-libpassthrough.bb [new file with mode: 0644]
recipes/dreambox/dreambox-secondstage.bb
recipes/enigma2/enigma2-plugins.bb
recipes/enigma2/enigma2-skins.bb
recipes/enigma2/enigma2.bb
recipes/enigma2/enigma2/7025_pvr_device_compatibility.diff [new file with mode: 0644]
recipes/enigma2/enigma2/enigma2.sh [deleted file]
recipes/enigma2/enigma2/fix-dvdburn-pathes.patch [deleted file]
recipes/enigma2/enigma2/new-hotplug.patch [deleted file]
recipes/gstreamer/gst-plugin-dvbmediasink.bb
recipes/gstreamer/gst-plugins-bad_0.10.21.bb [new file with mode: 0644]
recipes/gstreamer/gst-plugins-base_0.10.32.bb [new file with mode: 0644]
recipes/gstreamer/gst-plugins-good_0.10.27.bb [new file with mode: 0644]
recipes/gstreamer/gst-plugins-ugly_0.10.17.bb [new file with mode: 0644]
recipes/gstreamer/gst-plugins.inc
recipes/gstreamer/gstreamer_0.10.32.bb [new file with mode: 0644]
recipes/hotplug-ng/hotplug-ng.bb
recipes/initscripts/initscripts-1.0/dm7025/bootup_old
recipes/initscripts/initscripts-opendreambox_1.0.bb [changed mode: 0755->0644]
recipes/libdreamdvd/libdreamdvd.bb
recipes/libebml/libebml_0.7.8.bb [deleted file]
recipes/libmatroska/Makefile [deleted file]
recipes/libmatroska/libmatroska_0.8.1.bb [deleted file]
recipes/linux/linux-dm500hd-2.6.18/defconfig
recipes/linux/linux-dm7020hd-2.6.18/defconfig
recipes/linux/linux-dm7025.bb
recipes/linux/linux-dm7025/dm7025_defconfig
recipes/linux/linux-dm800-2.6.18/defconfig
recipes/linux/linux-dm8000-2.6.18/defconfig
recipes/linux/linux-dm8000-2.6.18/linux-2.6.18-dm8000-nand-smp-fix.patch [new file with mode: 0644]
recipes/linux/linux-dm8000_2.6.18.bb
recipes/linux/linux-dm800se-2.6.18/defconfig
recipes/linux/linux-opendreambox-2.6.18.inc
recipes/matroska/libebml.inc [new file with mode: 0644]
recipes/matroska/libebml_1.0.0.bb [new file with mode: 0644]
recipes/matroska/libmatroska.inc [new file with mode: 0644]
recipes/matroska/libmatroska_1.0.0.bb [new file with mode: 0644]
recipes/matroska/matroska.inc [new file with mode: 0644]
recipes/mc/mc-4.6.2/cross-compile.patch
recipes/mc/mc_4.6.2.bb
recipes/minicom/minicom-2.3/rename-conflicting-functions.patch
recipes/minicom/minicom_2.3.bb
recipes/openssl/openssl-0.9.8j/openssl-x86_64-bintuils-2.20.51.patch [new file with mode: 0644]
recipes/openssl/openssl-native_0.9.8j.bb
recipes/opkg/files/r599-fix-depmod.patch [new file with mode: 0644]
recipes/opkg/opkg-nogpg_svn.bb
recipes/opkg/opkg_svn.bb
recipes/opkg/update-alternatives-merge.inc [deleted file]
recipes/realtek/r8712u/config [new file with mode: 0755]
recipes/realtek/r8712u/strcasecmp.patch [new file with mode: 0644]
recipes/realtek/r8712u_2.6.6.0.20101111.bb [new file with mode: 0644]
recipes/tasks/task-opendreambox-cdplayer.bb
recipes/tasks/task-opendreambox-dvdburn.bb
recipes/tasks/task-opendreambox-dvdplayer.bb
recipes/tasks/task-opendreambox-enigma2.bb
recipes/tasks/task-opendreambox-madwifi.bb
recipes/tasks/task-opendreambox-modem.bb
recipes/tasks/task-opendreambox-wlan.bb
recipes/udev/udev-124/opendreambox/41-od-linux-2.6.18-misc.rules
recipes/udev/udev_124.bb
recipes/update-alternatives/update-alternatives-cworth_0.99.154.bb
recipes/vsftpd/files/opendreambox/vsftpd.conf
recipes/vsftpd/vsftpd_2.0.5.bb
recipes/zeroconf/files/opendreambox/zeroconf-default [new file with mode: 0644]
recipes/zeroconf/zeroconf_0.9.bb

index 08a7b60..67f88e1 100644 (file)
@@ -3690,6 +3690,14 @@ sha256=0f9ed5bcac0f34c474cfa844010a1594d64dc97d13c42bd1fc95d02e31f9504a
 md5=490e3bba594f1cafe80ca8024894df73
 sha256=ab24894eb6f36570342e42313e7dc88b6cafcbc72ed3cbeb3f680b8ad7184ec9
 
+[http://sources.dreamboxupdate.com/download/7020/bootlogo-dm500hd-7.elf]
+md5=07f00998af65ff252cd3c1483cc6db44
+sha256=d2875afa8ff54b9e22279a614161d92f6610dbbb7d2cc4528d0363931daab81f
+
+[http://sources.dreamboxupdate.com/download/7020/bootlogo-dm500hd-8.elf]
+md5=1a8592d5d6c1434a051592f3e9fd9e42
+sha256=11189507de3ac9eeb203eeeffd057868d47b5fedfb3697ff3a5d60df6e07269c
+
 [http://sources.dreamboxupdate.com/download/7020/bootlogo-dm500plus-1.elf]
 md5=ed92a7bd5fed65092d8a811b95add6d6
 sha256=50411190eee76edd1c4c95e71abde25b98d14619e53a3fb79a8cd66a807a84b8
@@ -3734,6 +3742,14 @@ sha256=fbcb3bfa04649a9be430ee17e53b2f0e09e95242509b61fca4326c8e4de1e807
 md5=64989d1f573f6188c17b6afdd02c060f
 sha256=f3a9c8e8438fe6ca479f3408dd2f5786a02605b632871af2c9b05e5284ad393e
 
+[http://sources.dreamboxupdate.com/download/7020/bootlogo-dm7025-7.elf]
+md5=1b9e4493d0bbc7c6e03a3d25c37793cb
+sha256=d575121f8adf753dcbaf3a2f5a56639316537f9c31ef0cab08809a9a488f927a
+
+[http://sources.dreamboxupdate.com/download/7020/bootlogo-dm7025-8.elf]
+md5=a5fef97270f6fde0756e3f284083ba4b
+sha256=a6bdf6ff3efb891aa225f791e7b3232c270a93eac41ea6b165aeb2a1d06f73e8
+
 [http://sources.dreamboxupdate.com/download/7020/bootlogo-dm800-1.jpg]
 md5=7871d4e8a1e656ca6f13210f0e3e5624
 sha256=9458d02e07a1a8f725c773db2944c0ddb2145207f01593a12abcfefcda7fbea0
@@ -3746,6 +3762,14 @@ sha256=aefcfc0166e55f88694ecb9d0c4f699e044d7843f0c4b3e2f53a2930114e0c1d
 md5=65d3c926e9c4de2ce53c2e39255af166
 sha256=668de4963b2df802e734e91d9a9007a92f647ecab6ffb15a759c3dc1e9de5109
 
+[http://sources.dreamboxupdate.com/download/7020/bootlogo-dm800-7.elf]
+md5=83fc7c2a6fd4094554ce955ea779ee86
+sha256=218e63430039e17d99bb20558124abf833598cff89b0344eea4315645075de75
+
+[http://sources.dreamboxupdate.com/download/7020/bootlogo-dm800-8.elf]
+md5=3ff03ced08ee1b64fbe5296754274830
+sha256=d7176691ebf16b7d2a364baebaeccda9a9ef9a8dc686d524d35da2e8d123d55b
+
 [http://sources.dreamboxupdate.com/download/7020/bootlogo-dm8000-1.jpg]
 md5=017abc2244931c14464ae6d4ad8c2296
 sha256=5f8ea9e76a10c28282425cb1fccbcfd5897da1e83adeaa9d89744c3597f49f02
@@ -3766,6 +3790,14 @@ sha256=0c02c791020c5d230fafc226f2282f42434a0b4db66e6aa7eda56f23cec01578
 md5=94c742d4dffa3060b20daec48d425bc8
 sha256=536551e3ed7cca7e4f7f6c5802b61a83df51b70510c658f509ca847723819106
 
+[http://sources.dreamboxupdate.com/download/7020/bootlogo-dm8000-7.elf]
+md5=78c9f3482d8f0d57f5593509073b182f
+sha256=29a5251a35609785bc7458fb67e0f5b1441f335c9d8b737df29ed04aa9223276
+
+[http://sources.dreamboxupdate.com/download/7020/bootlogo-dm8000-8.elf]
+md5=f017e50dbc31db036509058f9be3628c
+sha256=5114b56136a7c5e05fb93eb54b22b635c19133e3b33df61725d5638d5152fb0d
+
 [http://sources.dreamboxupdate.com/download/7020/bootlogo-dm800se-2.jpg]
 md5=108961febf18a0084a302056deb5af18
 sha256=e8f1cca42a7ffdca28387db0698e3e08068dcebe0a19d17af0bb7eed7a23da5a
@@ -3782,6 +3814,14 @@ sha256=0f9ed5bcac0f34c474cfa844010a1594d64dc97d13c42bd1fc95d02e31f9504a
 md5=490e3bba594f1cafe80ca8024894df73
 sha256=ab24894eb6f36570342e42313e7dc88b6cafcbc72ed3cbeb3f680b8ad7184ec9
 
+[http://sources.dreamboxupdate.com/download/7020/bootlogo-dm800se-7.elf]
+md5=0ac8a4f02af5cd43fe37cf50f5687d69
+sha256=1d1414560d0ad208e2f4f70a3b078bb108e834bbdd14446a85c76be1df58e745
+
+[http://sources.dreamboxupdate.com/download/7020/bootlogo-dm800se-8.elf]
+md5=2fbb11f68c632048eba6efafdb2e59c1
+sha256=74159f8a89749a7e645c9b67ed13c76a11824df4b414780988d484ed2e4e0bd8
+
 [http://sources.dreamboxupdate.com/download/7020/bootlogo_wait-dm500hd-1.mvi]
 md5=919841a4457bf7d2094e16c4ecc99a27
 sha256=8f5a0cab9603b360f7d42f41c48fcbe6c124d63ece994b685d69849e3d622f19
@@ -6306,6 +6346,18 @@ sha256=4de582b6e8ce21001392b71f4b1987eccf0eca49307576221d8af167667594bc
 md5=51111ab16974e9821bb7261bf08e77e6
 sha256=57ba82fe175290edbcf8bea94d3cf05547eac1d33ad9a9297ca30abd06214ed9
 
+[http://sources.dreamboxupdate.com/snapshots/dreambox-dvb-modules-dm500hd-2.6.18-7.4-dm500hd-20110215.tar.bz2]
+md5=cc5473a33dbeeb0f62442855783a425f
+sha256=646285bca898bee4388077142e9eaba91fca43fd7718f2d93a5874e2b51fcd80
+
+[http://sources.dreamboxupdate.com/snapshots/dreambox-dvb-modules-dm500hd-2.6.18-7.4-dm500hd-20110302.tar.bz2]
+md5=6c00a0d03de051a324153e7fc8121066
+sha256=5d1776172612d29e98a350e352a06cb9cdadde5b0c44334783e189cda233ef9d
+
+[http://sources.dreamboxupdate.com/snapshots/dreambox-dvb-modules-dm500hd-2.6.18-7.4-dm500hd-20110309.tar.bz2]
+md5=d3140696969d365a9f1489ca79342537
+sha256=ab4e6f4946accc12343d0091e07219eafcfe0b1b906a566cc39dfbb54306536d
+
 [http://sources.dreamboxupdate.com/snapshots/dreambox-dvb-modules-dm500hd-2.6.30-dm500hd-20090727.tar.bz2]
 md5=af8928a01a8f11fa5845821be05774ef
 sha256=be98fe6dab366479f6aefb2bb7c516258cb03e67e718735f2b7787577c7ea188
@@ -6418,6 +6470,18 @@ sha256=e3675f7bbbc6cbcedbf3261818b2dbefa9a60305fddb65acd9c8257d86d24e3b
 md5=920415db2e8d8abc7c819b23109c79ae
 sha256=58513df277ba0c2e2c1aebf9cd7f34622a2dbe4f9ac5a0d3c0caffee52ab2813
 
+[http://sources.dreamboxupdate.com/snapshots/dreambox-dvb-modules-dm800-2.6.18-7.4-dm800-20110215.tar.bz2]
+md5=ff15c3bbc66f01ad24243c13907f36b9
+sha256=925fa48874465e1252e4e1c6d3f84676124bcf3bdc133853e8dc273ecf0f2e7f
+
+[http://sources.dreamboxupdate.com/snapshots/dreambox-dvb-modules-dm800-2.6.18-7.4-dm800-20110302.tar.bz2]
+md5=1b94daf03567a5581e1a471782ce6427
+sha256=9ffcc5a999565f769c9ffeb936c9f258c73f1912adf09754d23f85a2103b1f3e
+
+[http://sources.dreamboxupdate.com/snapshots/dreambox-dvb-modules-dm800-2.6.18-7.4-dm800-20110309.tar.bz2]
+md5=e4f51f35b541f4da94e4c6c4bd023df6
+sha256=39d186c9fe9b44776e9f752d64351c3daeb4335179ec8ec796f19771bb8c8139
+
 [http://sources.dreamboxupdate.com/snapshots/dreambox-dvb-modules-dm800-2.6.30-dm800-20090723.tar.bz2]
 md5=41cee549349eb264823d8605525f7d82
 sha256=a7125978936a877238e96683e297da56ebc45bfa91d6a1f6d3ae075fb3cdcff6
@@ -6498,6 +6562,18 @@ sha256=08780a54222ad0e6c0b8225d17b804af2a80a3b0228664a3d49df101e7ad345a
 md5=2042d9a8b6fb7dd08a387b1fb089821e
 sha256=615734e0ff82ff58338a725e3c2685e332ea86233576438a7b03f2ec9475977e
 
+[http://sources.dreamboxupdate.com/snapshots/dreambox-dvb-modules-dm8000-2.6.18-7.4-dm8000-20110215.tar.bz2]
+md5=9c8119eac828d21738f95f1ec39eb150
+sha256=c9e918e3161e5c33d105769ffbcb26db71e7decacccc646596917eedacb31952
+
+[http://sources.dreamboxupdate.com/snapshots/dreambox-dvb-modules-dm8000-2.6.18-7.4-dm8000-20110302.tar.bz2]
+md5=52f97895653391eefa7e95d5917c8a82
+sha256=cb7f69e2b7f83424ca835e422b3410d69159e2a133fa2b7a871e7dd4941850e1
+
+[http://sources.dreamboxupdate.com/snapshots/dreambox-dvb-modules-dm8000-2.6.18-7.4-dm8000-20110309.tar.bz2]
+md5=b0df484344ea6532b8539e0060eda92e
+sha256=1d279d231456fc97efbdcb5cd3429395b2dfbfa045aeb0612079d53220965259
+
 [http://sources.dreamboxupdate.com/snapshots/dreambox-dvb-modules-dm8000-2.6.30-dm8000-20090722.tar.bz2]
 md5=1958814f60d0076b0a6192cffef5a99f
 sha256=40a002f33134c97b19b0430d9bbdf4e1cab854d2075df1f5d9b2f275821552f6
@@ -6546,6 +6622,18 @@ sha256=103620877c1e636962f87697b1031266cbf45327bb77e506d9d1ad93761fd8d3
 md5=6d9adc6548c71ac4278771dc93ed076e
 sha256=ca6c952d17c93dd0e29ab509cc7be067faa62931159fb83681f712aff5d2495a
 
+[http://sources.dreamboxupdate.com/snapshots/dreambox-dvb-modules-dm800se-2.6.18-7.4-dm800se-20110215.tar.bz2]
+md5=8698804ed1dd383984e684dd4ed641d7
+sha256=26be6d8e4adc43ee47eddc63a5500c51b64dffbf8ece7d199ba3c1911ade9a4c
+
+[http://sources.dreamboxupdate.com/snapshots/dreambox-dvb-modules-dm800se-2.6.18-7.4-dm800se-20110302.tar.bz2]
+md5=e3c530f79d2d6c396cdab842229418bb
+sha256=c18417fd8fad8320089e025e7eb0bcd4237e9b4cea2bb1d482f3bea0602c772f
+
+[http://sources.dreamboxupdate.com/snapshots/dreambox-dvb-modules-dm800se-2.6.18-7.4-dm800se-20110309.tar.bz2]
+md5=c843a06f5ccaac950e73c13409ab77f4
+sha256=060ba81617d5d2e7b3df746a4ea4f33ae570991da042c83b6fe5b3acd8048466
+
 [http://sources.dreamboxupdate.com/download/opendreambox/dreambox-dvb-tools-1.0.tar.gz]
 md5=df202c4cbf6cc5be5a73c0c13d8c15ee
 sha256=cbc3b5526b531f92873ccfb690cbe6ce3567b1576e4b125413109acf24c09238
@@ -6558,6 +6646,10 @@ sha256=d2005e7b8ea9d8d8b4503117daf18a642bbabd0e013d41302c5f80e3333c67ef
 md5=a66b2298421cf24b217a27f19001cb19
 sha256=121708ec759114376a6daf31640c56e35387d53aaed0ab411ae2b25e9b330548
 
+[http://sources.dreamboxupdate.com/download/opendreambox/dreambox-dvb-tools-v3-1.8.tar.gz]
+md5=ee94b5953fde3ff31270985c9a9851c7
+sha256=58d0ecda47acfd90f0127ab62327bb98446a68fe5f03bcc9cfa0e55c4ab53719
+
 [http://xorg.freedesktop.org/releases/individual/proto/dri2proto-1.1.tar.bz2]
 md5=1d70f0653b0b3a837853262dc5d34da4
 sha256=69def6d1f64b3699ec9c729596d8b096623a62bdda6bbea78ed690421d174c11
@@ -7770,6 +7862,10 @@ sha256=0e9e771114a75c461e813538f129eb05a251b8fc6591a5563420700b8e312da0
 md5=be8503f15c3b81ba00eb8379ca8dcf33
 sha256=16de61d7426b1df7aee54b48c16aa728de1ed82f95db5fc4d8886d5d2702d90a
 
+[http://ffmpeg.org/releases/ffmpeg-0.6.1.tar.bz2]
+md5=4f5d732d25eedfb072251b5314ba2093
+sha256=e348aa6d0bb199f231aa3a48e8f457f037c763219bccc8b395e007ccd87ebd5f
+
 [http://folks.o-hand.com/dodji/0xdeadbabe/ffmpeg_xine.tar.bz2]
 md5=e67e1c2eb134d2fba50a524188b6a3b4
 sha256=61ba89c0deaaf324485b2bf480fdb90941b74e2c47b4810e34f530b77005bb8c
@@ -7906,6 +8002,10 @@ sha256=9d13db38c065d70f48ce70580c7d8cd940d923192c04bc3cb356cc98879b5788
 md5=2f7b19e11f29ecf733d51f46213a0219
 sha256=51c7eeaf161ce1ebcc44bc47225ee4a4c9c97d229d739211074916deedd9e1a2
 
+[http://dreamboxupdate.com/download/patches/fix_lzma_squashfs_makefiles_for_oe-r3.patch.bz2]
+md5=39aa53c41f98a84c5ef36aa18a90ccda
+sha256=7d82314d9764383878b1f54715959545f41ba936e1f6bcd77e395619c206715c
+
 [http://xlibs.freedesktop.org/release/fixesext-2.0.1.tar.bz2]
 md5=6cc725db32346058a4adeef283335ae1
 sha256=c7ce53b1678268ec2f08d0a32580c2783b6e297941de36d8b880c0533ed51c26
@@ -12098,6 +12198,10 @@ sha256=7b6c49f22caad3b573aee481381355b38ac9f2077f291d9f33a9a808a2568888
 md5=7c84766f6d24f41ba90c3f6141012ab8
 sha256=1031dff866df976a957f34039addbab4c0753406299a275f4cf1780e1dbe2a90
 
+[http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.21.tar.bz2]
+md5=f501336ab1d18d2565f47c36ce653a82
+sha256=422badacbda37ac33cb446c6751dabcd0b223c308dbb01024a34ded682fa47e3
+
 [http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.3.tar.bz2]
 md5=8545a02c408976c5e9f0c2cf3c6a362e
 sha256=648f1ef813c64c7eedd45d164eb41ba21366bba8ec5fcbff3100458721be489e
@@ -12170,6 +12274,10 @@ sha256=63938641380be9935c804ae8d55acdcfd93920ed2deb72dcf70f027a78b085d7
 md5=9baa0d87e81c88b2477a3554ab629c46
 sha256=abb006c78222cfb69d31e983268d1d5219e9d4e0da24c6c4cd687968af7a33bd
 
+[http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.32.tar.bz2]
+md5=2920af2b3162f3d9fbaa7fabc8ed4d38
+sha256=e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b
+
 [http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.5.tar.bz2]
 md5=2b5958fb0baaf8d1b4eae18f7b13d49b
 sha256=fe2fb4fe446a1d3f8ccd4284ae7ffd25cb9f1b836b3d0e29d2494d10c1ae3eac
@@ -12230,6 +12338,10 @@ sha256=b5d5750c12412c47d85ba9391c842f6f02cad9511876695e48b15fb37e4699f6
 md5=e1ed191adbf81edff04f348f8ce8e198
 sha256=ceb3bbea5ce18463b8fe470d34786bc846469e800305c436d799af9fe22bdcc4
 
+[http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.27.tar.bz2]
+md5=c25d6c51916424009dfde4ee42ae1feb
+sha256=a9d801c3d42b456a6ebc0b95f68c44f153f756ec0fbd4877197c469cc67771fa
+
 [http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.4.tar.bz2]
 md5=e189496e7987898823d28d26b79f63dc
 sha256=f2b90ef5fb4b2d0b06d5fd8193a7c19b1d08d4f737abeafabf04d39673ea703b
@@ -12278,6 +12390,10 @@ sha256=ceebb7878d957a61cf437c1f93934a0371631fa50e4111ef016691d65866790c
 md5=989e1b0fab010f73f76912f70ec5f62a
 sha256=d7fc7636001e78736540c628ad889888cb85ea722f08d1c6813b16682dd9c09c
 
+[http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.17.tar.bz2]
+md5=504ed6508c3a8f035a2002ed69d68506
+sha256=0cbd4aa8dceafea21ddd547dfde686a8836f68ba547afa5575a52b64cfa0b369
+
 [http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.2.tar.bz2]
 md5=cf604b6acd80b57dc5173db7e93fc116
 sha256=c882c7485faec9803d2f61efbaedd02742e78d224a7d29d61a0a884cd962a09f
@@ -12386,6 +12502,10 @@ sha256=e8ef301be423797ff36a0bb3615930b112b4175634051d19fd655e0ed974532a
 md5=a21fb08bdb578d972c7c14e77da8fbb6
 sha256=7f737e6d047c1ebeb4e1e0725fc377c5d9f12ee89186de7960be3cbba709ab84
 
+[http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.32.tar.bz2]
+md5=442bc3d37b8511a73379143e7531d726
+sha256=3bf4e46a186ee9a1f5e212aaf651d67cffb4f5f05345a7c99ae71d5d992be133
+
 [http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.4.tar.bz2]
 md5=263a7800ecf44d0f38d0cbc80bce65ff
 sha256=7b8add7db1e0b0e3671f374469ef32b151fa96bc9eb2aa265eefd79548752ffc
@@ -15962,6 +16082,10 @@ sha256=eed72871201e2c1deae3d7c0b618bf16f306d91fc7ebcb53956ab7468663514f
 md5=6278109f52e4f9d2c8a8dfc0d668b587
 sha256=bcf51ad8f059f52523d1683f2234fe0103d747d9fe0eb49b1e9be67ee842a0f8
 
+[http://dl.matroska.org/downloads/libebml/libebml-1.0.0.tar.bz2]
+md5=6d438f03d8928d83a2d120ed02705f03
+sha256=72480dec736cd5df5bc9e8c3864a58d17715542c83ff1b2095dca46cc1b8b178
+
 [ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles/libedit-20050118.tar.bz2]
 md5=c261f059f71cef79d0f793ba944a5891
 sha256=494c19b29d2880d92361bb5bd0e02b8db9cd2dd9c1c3b330170a91e215911f89
@@ -16906,6 +17030,10 @@ sha256=f7054f93c57ba6b758d0e4f47d4d2dd96a7fe487e1157eb70a4d642910275aea
 md5=2ceb8235e5189fe4e79ec25ebd97b56b
 sha256=ee1f0c6a975ee14dd8b4b28b75d8f7a9f8498210d82e74411dbe95871382a7e9
 
+[http://dl.matroska.org/downloads/libmatroska/libmatroska-1.0.0.tar.bz2]
+md5=4efcf3945b17a6f0320cf1aaa326a4de
+sha256=dc000523df508e457ead6447b2d9a2c549fbff525783c13a96d19bbd61137b88
+
 [http://www.matthew.ath.cx/projects/java/libmatthew-java-0.7.1.tar.gz]
 md5=6a4db221129f230c64a0f937d00bb703
 sha256=003c44be21859d1495c0571e249ce17edd5ac58636f67b6a8bc4f395a6c7e6a2
@@ -17350,6 +17478,22 @@ sha256=074fbf840f73b1e13e0405fce261078c81c8c0a4859e30a7bba10510f9199908
 md5=5999c2d52f8c07eeef2a8808fee4f858
 sha256=5aed4edfd2023ed3ccd566fe76131d10faf43c8c3efa2e90978eed37c5503165
 
+[http://sources.dreamboxupdate.com/download/7020/libpassthrough-0.1-dm500hd.so]
+md5=8a1a8c0600358220af6afebe79d8ff0d
+sha256=208f54c24f62b5f73f6c0879b242c6a42be21d61311d206edebf543ede2c8634
+
+[http://sources.dreamboxupdate.com/download/7020/libpassthrough-0.1-dm7020hd.so]
+md5=8a1a8c0600358220af6afebe79d8ff0d
+sha256=208f54c24f62b5f73f6c0879b242c6a42be21d61311d206edebf543ede2c8634
+
+[http://sources.dreamboxupdate.com/download/7020/libpassthrough-0.1-dm8000.so]
+md5=8a1a8c0600358220af6afebe79d8ff0d
+sha256=208f54c24f62b5f73f6c0879b242c6a42be21d61311d206edebf543ede2c8634
+
+[http://sources.dreamboxupdate.com/download/7020/libpassthrough-0.1-dm800se.so]
+md5=8a1a8c0600358220af6afebe79d8ff0d
+sha256=208f54c24f62b5f73f6c0879b242c6a42be21d61311d206edebf543ede2c8634
+
 [http://www.at.tcpdump.org/release/libpcap-0.9.3.tar.gz]
 md5=0ad921c881fdd3d278046afcd352a151
 sha256=f20d19b1f32e4ee465169ff1e17a3755bfda8c697cfed11fe36cbf6959c80441
@@ -25514,6 +25658,10 @@ sha256=91619748c4dba733c60eb8a40805c972f407b2463dc6de856ac40336d66bc16c
 md5=5b60500bc9605d2409b71124e48aa929
 sha256=59cc003bab753335b3ce14a908e663ea782514b3531dc7030379ff753ef1a78c
 
+[http://dreamboxupdate.com/download/sources/rtl8712_8188_8191_8192SU_usb_linux_v2.6.6.0.20101111.tar.gz]
+md5=137423701c43ac5f09007a393406e678
+sha256=34ef8534361b0ce9ec756de8babe68f40ba9ce7a2be23d84cf9c185cc4a7c9bb
+
 [http://cloud.github.com/downloads/kichkasch/rtmom/rtmom-src-0.1.3.tar.gz]
 md5=c4a1012fc0e00d2b64d8d794166bf893
 sha256=9227e503a90054dd643364272d48b3eae8dae3a9c6c4a42a2859395a8786398f
@@ -26022,6 +26170,30 @@ sha256=413278a3635a8189b27f5b3e7d4947aff0181baaecc4f45945bfaa5a896e0e7a
 md5=ed72a5fd8ca7a310a109e8cb5f5399b8
 sha256=3f4ed558b252cb8d4a3fc25bcad46c0412c3ff174a45b2b6288c5777cbfe5550
 
+[http://sources.dreamboxupdate.com/download/7020/secondstage-dm500hd-81.bin]
+md5=d56f8b1a79b07f5b1b972f014ddd8926
+sha256=dca8c2b4b8068828ef74d635e06c4eb25ccb4f719f941aea6dc6223a24a96858
+
+[http://sources.dreamboxupdate.com/download/7020/secondstage-dm500hd-81.nfi]
+md5=8ef9a5eb9a457f82a872a12a29372c51
+sha256=02d0a81a92ec93aac49cd58fb2163525e7bb3ff4bbd0e3c09542ddcca779ed70
+
+[http://sources.dreamboxupdate.com/download/7020/secondstage-dm500hd-82.bin]
+md5=0a18ed36a205ddc96e5c3a20cfacdf02
+sha256=df0033dddaa9f842380b4ab29d1df176fad0d6426160c48fbb7a6a44bb0560f5
+
+[http://sources.dreamboxupdate.com/download/7020/secondstage-dm500hd-82.nfi]
+md5=b68c6116ef1fd775f970827e300195bc
+sha256=fe42d1298969621291255f3a97a6eb96165b4822977f1a3ba31c12c11ae090fa
+
+[http://sources.dreamboxupdate.com/download/7020/secondstage-dm500hd-83.bin]
+md5=df43e0d715062e83124b435d778ed155
+sha256=c8490a2c4a645784b58b6693d6e274ef376db301670126ca952b9da7eef0c5c3
+
+[http://sources.dreamboxupdate.com/download/7020/secondstage-dm500hd-83.nfi]
+md5=29224516d8486d195f678f22647a85db
+sha256=e352d8e4c7ad44caea2c41b37bf6e62e68e5cd70ab080485cef607587dc32ae7
+
 [http://sources.dreamboxupdate.com/download/7020/secondstage-dm500plus-66.bin]
 md5=7f39bb5b08a100b5fbb6f157687e2679
 sha256=6d745f4be850cb952b433f70c0ac3ebd5d5ec6a69085259bd7e220d28dbad5c2
@@ -26050,6 +26222,30 @@ sha256=5732cb1e6e7603e3b7b665dd60cab26c0fdf74ea3722bbe2a87810874026b988
 md5=c5e438ab5f60d093bee1ec1d3ad6a2b5
 sha256=d603a9ffb22f62a4db4f154fa7523191bb18c2a0581458762ce9cf08fe531aba
 
+[http://sources.dreamboxupdate.com/download/7020/secondstage-dm7025-81.bin]
+md5=54652b2803a2c30a59f64ee6f0584139
+sha256=cb2e717347ffafdc6650b2989a1bb1ddf7532d244962bc508f68fb88a5d1ccc8
+
+[http://sources.dreamboxupdate.com/download/7020/secondstage-dm7025-81.nfi]
+md5=e3b9def5168e622ef707fe15a7173d4c
+sha256=ebda6f56e354fac05499d0707745422fbaa55f924f5612ac0f154ce2012aedba
+
+[http://sources.dreamboxupdate.com/download/7020/secondstage-dm7025-82.bin]
+md5=6de738275b2223c1bd91ca0006d25551
+sha256=68cb5e410672be5524591f34427def44476bbfca1de979c6fcbe30f47b650548
+
+[http://sources.dreamboxupdate.com/download/7020/secondstage-dm7025-82.nfi]
+md5=b234dd9789d79265db264fa61822d570
+sha256=2d0cb3a80bfe6120bb58af9dd1fef8a23e5019a42dcd6a43b285fa290df48b06
+
+[http://sources.dreamboxupdate.com/download/7020/secondstage-dm7025-83.bin]
+md5=9ea6a1c1446cb27a96c1f382921750d8
+sha256=d953a9a92f191ef0e73d10756d369cfff2a340e006870b33a2bef5d7173e0740
+
+[http://sources.dreamboxupdate.com/download/7020/secondstage-dm7025-83.nfi]
+md5=0f56767c68bc46d32ab4ca43bca8372d
+sha256=65dc2d3b5dbfeac80dbef51bfb8a38508c462fbf692558297fc254f228543301
+
 [http://sources.dreamboxupdate.com/download/7020/secondstage-dm800-73.bin]
 md5=b9fec37a3b099f4733618b2698edf021
 sha256=4ea7695aea2d6fdfec2355a21bdc76ab37438e1b2faa10b0be8fed95a2687cf3
@@ -26074,6 +26270,22 @@ sha256=dbf4874db86a02fadc4c6482f8044ccd151b163540479cc83a25ff010b957717
 md5=f25e87c7f31db95a15560a690a849420
 sha256=a73a5cfca09c1fe7b6d9ce1a38916ee5c859140892bb31666125d73b9c362a6d
 
+[http://sources.dreamboxupdate.com/download/7020/secondstage-dm800-81.bin]
+md5=13d4acec36c74f581b0ead85b0861345
+sha256=ca16d82f2c466e8f0b72ced3fece3f841a276f18e9a4dedc3b897762b71bcb6c
+
+[http://sources.dreamboxupdate.com/download/7020/secondstage-dm800-81.nfi]
+md5=37744eaca04cf847f5ed2565638f4a8d
+sha256=df8e60c2dbb3a743ba7eb94520ab77d10c0a6cd5a1d06c60ed18645654bd28b6
+
+[http://sources.dreamboxupdate.com/download/7020/secondstage-dm800-82.bin]
+md5=3f156922a52a4a29ce195ae144b4ca22
+sha256=e1ecbe7f8127ebbce357dab858380ed9908b4e239c1562c02eb04ca6293577b3
+
+[http://sources.dreamboxupdate.com/download/7020/secondstage-dm800-82.nfi]
+md5=64d0e5c5d90188c8f767d6bdf3f3b0dd
+sha256=40b0e3e8673066162f924af1b34c8c54c453264deba186aab45b94747e5a6851
+
 [http://sources.dreamboxupdate.com/download/7020/secondstage-dm8000-73.bin]
 md5=51a6aaa258a9684ab5dd64ea16296ebd
 sha256=74cb12156867bddfa110f51e52bfd186686eefb58f150c7c1306d1bce04756a6
@@ -26090,6 +26302,22 @@ sha256=023519e8c3acf2418036bf1e1770ebb8a0a873f7a41c0b1b9a0afae5bdd080a5
 md5=475af825e7f7d1fc3a4d79ef751e5b11
 sha256=58113eb4e4c12fce29b6a43d08c2c685f73a49ea0bce431e7fffdba41dfbca4b
 
+[http://sources.dreamboxupdate.com/download/7020/secondstage-dm8000-81.bin]
+md5=068ecbdbfda3ebc018f14ac89750e966
+sha256=4fef104c63bb1ed71597f23d07f4ef3418ca58a55891f8fbcb74b45cfd4094b3
+
+[http://sources.dreamboxupdate.com/download/7020/secondstage-dm8000-81.nfi]
+md5=464c38a8a5d3b98d2ee84cb9cd3b7bc4
+sha256=cf901ee570a67a315b51cf15528cd94be7097f393c4e05db2d1bc25edb0b76a2
+
+[http://sources.dreamboxupdate.com/download/7020/secondstage-dm8000-82.bin]
+md5=0dd681621397ca2b6041f3d8f906d4b7
+sha256=d77b2e8635f1a20cad70f2d16c77ab16a608dc2748c9b75aa077ad49e26c9ae6
+
+[http://sources.dreamboxupdate.com/download/7020/secondstage-dm8000-82.nfi]
+md5=ad918ba803fd85c245019b36b9976170
+sha256=104b9a8f4fe11f33fab121968b76dbe89a7626a6c6c665b02a917e288323bedf
+
 [http://sources.dreamboxupdate.com/download/7020/secondstage-dm800se-79.bin]
 md5=7b9914794294d6aae2837ca1f3847f98
 sha256=45884b2fe6a5c54864cce80fc7bca20b611b4d348799807601f2a750b77664e2
@@ -26114,6 +26342,22 @@ sha256=23df25591e8ddcbe51f22ff6f73ba259384f530189647fef96932a89875886c0
 md5=6ade50fd85483831330ea3e3b04e54ae
 sha256=b29925ab0bad2e852b131b960ae3a4aa38f75bb1ed5e5314dfdf728e3657d175
 
+[http://sources.dreamboxupdate.com/download/7020/secondstage-dm800se-81.bin]
+md5=95e87463241a89cfbe2f2d4d405cd54f
+sha256=48966257a4f2ff21a6f1b030e65c884c222c0b29b23d03587b542101290c5e0d
+
+[http://sources.dreamboxupdate.com/download/7020/secondstage-dm800se-81.nfi]
+md5=e792a3fecb830c56333ed34f3c769b1f
+sha256=f28a4e2a32291c23d3984aee3694b5f1b6aaf76692e06ca015db22badd7f2155
+
+[http://sources.dreamboxupdate.com/download/7020/secondstage-dm800se-82.bin]
+md5=166166a014eac838706589d7da471d5a
+sha256=92dd1a6375a3bca94b7264851d8cb114fc5794eee93eab104e10be44f0a7a621
+
+[http://sources.dreamboxupdate.com/download/7020/secondstage-dm800se-82.nfi]
+md5=c7ae93591d9da26317e919a660a0a036
+sha256=dffed373ae5cead1941e295368ea9b5d3592934bb86f905869d580306bf2aac1
+
 [ftp://ftp.gnu.org/gnu/sed/sed-4.0.8.tar.gz]
 md5=fb7fa2a7336afc358012763b292e2124
 sha256=a02d8c006bc0531bd646cae3082b7db8c7a1969084411cb129ec105fd12c0a13
@@ -29642,6 +29886,10 @@ sha256=d2e7bd98d1c38f374f30238abac7bde3a9f9675993e9af86ec69179234b71fe8
 md5=4e3b85f725dcf3ff1e8eb08e5a139ce2
 sha256=5741602b540e9b2256c7ce7cdfd2140185edb4b43eeeccae87aaa98b48c37c8e
 
+[http://sources.dreamboxupdate.com/download/7020/writenfi-mipsel-2.6.18-r2]
+md5=6770e563a63c6ea34cdb631651409159
+sha256=826eb7b48ea07302583de262a42884201c6598c5a2ce490ee4ef46057bb4ce27
+
 [http://sources.dreamboxupdate.com/download/7020/writenfi-r1]
 md5=a164b8654bc5311c53d95a7666bab706
 sha256=f77c32f33b674e2876270d63320e93d9152a3eed444313ec5838b8dfee0ae863
@@ -33882,7 +34130,3 @@ sha256=f57c4e33eb2cdd87a6c2f01bfa4794340fbe61ea1a1cfc7dac3b6671e1dd22af
 md5=5f7b88ebb2bcd7e8044328482d079661
 sha256=f57c4e33eb2cdd87a6c2f01bfa4794340fbe61ea1a1cfc7dac3b6671e1dd22af
 
-[http://ffmpeg.org/releases/ffmpeg-0.6.1.tar.bz2]
-md5=4f5d732d25eedfb072251b5314ba2093
-sha256=e348aa6d0bb199f231aa3a48e8f457f037c763219bccc8b395e007ccd87ebd5f
-
index f506bba..b2d8088 100644 (file)
@@ -14,8 +14,6 @@ COMBINED_FEATURES_append = "${@base_contains('PREFERRED_VERSION_linux-dm500hd',
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS_2.6.18 = "\
        kernel-module-nls-iso8859-15 \
-       kernel-module-nls-iso8859-1 \
-       kernel-module-nls-cp437 \
        kernel-module-nls-cp850 \
        kernel-module-nls-utf8 \
        v4l-dvb-module-dvb-core \
@@ -80,6 +78,6 @@ IMAGE_CMD_jffs2 = "\
 GLIBC_EXTRA_OECONF = "--disable-profile --with-tls --with-__thread"
 TARGET_FPU = "hard"
 
-MACHINE_FEATURES += "modem wifi"
+MACHINE_FEATURES += "modem wifi dreambox-libpassthrough"
 
 require conf/machine/include/dreambox-mipsel.inc
index 472055a..8ba5302 100644 (file)
@@ -14,8 +14,6 @@ COMBINED_FEATURES_append = "${@base_contains('PREFERRED_VERSION_linux-dm7020hd',
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS_2.6.18 = "\
        kernel-module-nls-iso8859-15 \
-       kernel-module-nls-iso8859-1 \
-       kernel-module-nls-cp437 \
        kernel-module-nls-cp850 \
        kernel-module-nls-utf8 \
        v4l-dvb-module-dvb-core \
@@ -82,6 +80,6 @@ IMAGE_CMD_jffs2 = "\
 GLIBC_EXTRA_OECONF = "--disable-profile --with-tls --with-__thread"
 TARGET_FPU = "hard"
 
-MACHINE_FEATURES += "modem wifi"
+MACHINE_FEATURES += "modem wifi dreambox-libpassthrough"
 
 require conf/machine/include/dreambox-mipsel.inc
index dada2dc..0f3d3e8 100644 (file)
@@ -31,7 +31,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "\
        ${@base_contains('PREFERRED_VERSION_linux-dm7025', '2.6.12.6', 'unionfs-modules hotplug-ng', 'kernel-module-unionfs \
                kernel-module-ext3 \
                kernel-module-nls-iso8859-15 \
-               kernel-module-nls-iso8859-1 \
                kernel-module-nls-cp437 \
                kernel-module-nls-cp850 \
                kernel-module-nls-utf8', d)} \
index 0d077e5..a26d35c 100644 (file)
@@ -13,9 +13,7 @@ COMBINED_FEATURES_append = "${@base_contains('PREFERRED_VERSION_linux-dm800', '2
 #take care when you do changes on MACHINE_ESSENTIAL_EXTRA_RDEPENDS/RRECOMMENDS you have to increment the recipes/tasks/task-boot.bb PR
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS_2.6.18 = "\
-       kernel-module-nls-iso8859-1 \
        kernel-module-nls-iso8859-15 \
-       kernel-module-nls-cp437 \
        kernel-module-nls-cp850 \
        kernel-module-nls-utf8 \
        v4l-dvb-module-dvb-core \
index cae2321..b9dd147 100644 (file)
@@ -19,9 +19,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS_2.6.18 = "\
        kernel-module-fb \
        kernel-module-snd-pcm \
        kernel-module-snd \
-       kernel-module-nls-iso8859-1 \
        kernel-module-nls-iso8859-15 \
-       kernel-module-nls-cp437 \
        kernel-module-nls-cp850 \
        kernel-module-nls-utf8 \
        v4l-dvb-module-dvb-core \
@@ -88,7 +86,7 @@ IMAGE_CMD_jffs2 = "\
 GLIBC_EXTRA_OECONF = "--disable-profile --with-tls --with-__thread"
 TARGET_FPU = "hard"
 
-MACHINE_FEATURES += "wifi"
+MACHINE_FEATURES += "wifi dreambox-libpassthrough"
 
 require conf/machine/include/dreambox-mipsel.inc
 
index be78171..e090dd9 100644 (file)
@@ -14,8 +14,6 @@ COMBINED_FEATURES_append = "${@base_contains('PREFERRED_VERSION_linux-dm800se',
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS_2.6.18 = "\
        kernel-module-nls-iso8859-15 \
-       kernel-module-nls-iso8859-1 \
-       kernel-module-nls-cp437 \
        kernel-module-nls-cp850 \
        kernel-module-nls-utf8 \
        v4l-dvb-module-dvb-core \
@@ -82,6 +80,6 @@ IMAGE_CMD_jffs2 = "\
 GLIBC_EXTRA_OECONF = "--disable-profile --with-tls --with-__thread"
 TARGET_FPU = "hard"
 
-MACHINE_FEATURES += "modem wifi"
+MACHINE_FEATURES += "modem wifi dreambox-libpassthrough"
 
 require conf/machine/include/dreambox-mipsel.inc
index 9a120de..8036848 100644 (file)
@@ -55,7 +55,7 @@ daemonoptions='--ghost '
 #
 # load custom settings
 #
-TIMEOUT=1
+TIMEOUT=5
 DISABLE_DIRECT=1
 DAEMON_EXIT_WAIT=20
 
index 749ad26..30ae94c 100755 (executable)
@@ -23,7 +23,7 @@ SRC_URI_append_vuplus = " \
            file://auto.network \
            file://autofs"
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 inherit update-rc.d
 
diff --git a/recipes/busybox/busybox-1.15.3/devfsd.conf b/recipes/busybox/busybox-1.15.3/devfsd.conf
new file mode 100644 (file)
index 0000000..46542e8
--- /dev/null
@@ -0,0 +1,17 @@
+# Enable full compatibility mode for old device names.
+REGISTER       .*              MKOLDCOMPAT
+UNREGISTER     .*              RMOLDCOMPAT
+
+# Restoring /dev/log on startup would trigger the minilogd/initlog deadlock
+# (minilogd falsely assuming syslogd has been started).
+REGISTER       ^log$           IGNORE
+CREATE         ^log$           IGNORE
+CHANGE         ^log$           IGNORE
+DELETE         ^log$           IGNORE
+
+# Uncomment this if you want permissions to be saved and restored
+# Do not do this for pseudo-terminal devices
+REGISTER       ^pt[sy]         IGNORE
+CREATE         ^pt[sy]         IGNORE
+CHANGE         ^pt[sy]         IGNORE
+DELETE         ^pt[sy]         IGNORE
index db027c9..8829cb3 100644 (file)
@@ -490,7 +490,7 @@ CONFIG_FEATURE_FDISK_WRITABLE=y
 # CONFIG_FSCK_MINIX is not set
 # CONFIG_MKFS_MINIX is not set
 # CONFIG_FEATURE_MINIX2 is not set
-# CONFIG_MKFS_VFAT is not set
+CONFIG_MKFS_VFAT=y
 # CONFIG_GETOPT is not set
 # CONFIG_FEATURE_GETOPT_LONG is not set
 CONFIG_HEXDUMP=y
@@ -582,7 +582,7 @@ CONFIG_FEATURE_CROND_DIR=""
 CONFIG_CRONTAB=y
 # CONFIG_DC is not set
 # CONFIG_FEATURE_DC_LIBM is not set
-# CONFIG_DEVFSD is not set
+CONFIG_DEVFSD=y
 # CONFIG_DEVFSD_MODLOAD is not set
 # CONFIG_DEVFSD_FG_NP is not set
 # CONFIG_DEVFSD_VERBOSE is not set
index 2852945..9c95a1e 100755 (executable)
@@ -1,6 +1,5 @@
 require busybox.inc
-PR = "${INC_PR}.5"
-PR_vuplus = "${INC_PR}.2"
+PR = "${INC_PR}.6"
 
 SRC_URI = "\
   http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
@@ -24,6 +23,7 @@ SRC_URI = "\
   file://defconfig \
   file://mdev \
   file://mdev.conf \
+  file://devfsd.conf \
 "
 
 SRC_URI_append_opendreambox = "\
@@ -51,4 +51,7 @@ do_install_append() {
     install -d ${D}${sysconfdir}/mdev
     install -m 0755 ${WORKDIR}/find-touchscreen.sh ${D}${sysconfdir}/mdev/
     install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/
+    if grep "CONFIG_DEVFSD=y" ${WORKDIR}/defconfig; then
+        install -m 644 ${WORKDIR}/devfsd.conf ${D}${sysconfdir}
+    fi
 }
index c202fda..4e4058e 100644 (file)
@@ -4,17 +4,13 @@ PRIORITY = "required"
 LICENSE = "proprietary"
 MAINTAINER = "Felix Domke <tmbinc@elitedvb.net>"
 
-IMAGES_VERSION = "1"
 BINARY_VERSION = "1"
+BINARY_VERSION_mipsel = "8"
+
+IMAGES_VERSION = "1"
 IMAGES_VERSION_dm500hd = "2"
-BINARY_VERSION_dm500hd = "4"
-BINARY_VERSION_dm7025 = "2"
-BINARY_VERSION_dm800 = "2"
-BINARY_VERSION_dm800se = "4"
 IMAGES_VERSION_dm800se = "2"
-BINARY_VERSION_dm7020hd = "4"
 IMAGES_VERSION_dm7020hd= "1"
-BINARY_VERSION_dm8000 = "6"
 IMAGES_VERSION_dm8000 = "2"
 
 PV = "${BINARY_VERSION}.${IMAGES_VERSION}"
index d9bb70c..0de2352 100644 (file)
@@ -18,28 +18,28 @@ PV_dm7025 = "${KV}-${@base_contains('PREFERRED_VERSION_linux-dm7025', '2.6.12.6'
 GCC_dm7025 = "${@base_contains('PREFERRED_VERSION_linux-dm7025', '2.6.12.6', '-gcc4.4', '', d)}"
 
 KV_dm500hd = "${@base_contains('PREFERRED_VERSION_linux-dm500hd', '2.6.18', '2.6.18-7.4-dm500hd', '2.6.30-dm500hd', d)}"
-PV_dm500hd = "${KV}-${@base_contains('PREFERRED_VERSION_linux-dm500hd', '2.6.18', '20101215', '20090727', d)}"
+PV_dm500hd = "${KV}-${@base_contains('PREFERRED_VERSION_linux-dm500hd', '2.6.18', '20110309', '20090727', d)}"
 
 KV_dm800 = "${@base_contains('PREFERRED_VERSION_linux-dm800', '2.6.18', '2.6.18-7.4-dm800', '2.6.30-dm800', d)}"
-PV_dm800 = "${KV}-${@base_contains('PREFERRED_VERSION_linux-dm800', '2.6.18', '20101215', '20090723', d)}"
+PV_dm800 = "${KV}-${@base_contains('PREFERRED_VERSION_linux-dm800', '2.6.18', '20110309', '20090723', d)}"
 
 KV_dm800se = "2.6.18-7.4-dm800se"
-PV_dm800se = "${KV}-20101215"
+PV_dm800se = "${KV}-20110309"
 
 KV_dm7020hd = "2.6.18-7.4-dm7020hd"
 PV_dm7020hd = "${KV}-20101111"
 
 KV_dm8000 = "${@base_contains('PREFERRED_VERSION_linux-dm8000', '2.6.18', '2.6.18-7.4-dm8000', '2.6.30-dm8000', d)}"
-PV_dm8000 = "${KV}-${@base_contains('PREFERRED_VERSION_linux-dm8000', '2.6.18', '20101215', '20090820', d)}"
+PV_dm8000 = "${KV}-${@base_contains('PREFERRED_VERSION_linux-dm8000', '2.6.18', '20110309', '20090820', d)}"
 
 RDEPENDS = "kernel (${KV})"
 
 #hack for broken busybox depmod (v4l-dvb dvb-core isn't automatically loaded on bcm740x load)
 DEPENDS = " module-init-tools"
-RDEPENDS_append_dm8000 = " dreambox-secondstage module-init-tools-depmod"
-RDEPENDS_append_dm800 = " dreambox-secondstage module-init-tools-depmod"
-RDEPENDS_append_dm500hd = " dreambox-secondstage module-init-tools-depmod"
-RDEPENDS_append_dm800se = " dreambox-secondstage module-init-tools-depmod"
+RDEPENDS_append_dm8000 = " dreambox-secondstage (>=81) module-init-tools-depmod"
+RDEPENDS_append_dm800 = " dreambox-secondstage (>=81) module-init-tools-depmod"
+RDEPENDS_append_dm500hd = " dreambox-secondstage (>=81) module-init-tools-depmod"
+RDEPENDS_append_dm800se = " dreambox-secondstage (>=81) module-init-tools-depmod"
 RDEPENDS_append_dm7020hd = " dreambox-secondstage module-init-tools-depmod"
 
 PR = "r0"
index fa0f9db..aebe38f 100644 (file)
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 MAINTAINER = "Felix Domke <tmbinc@elitedvb.net>"
 LICENSE = "GPL"
 
-PV = "1.7"
+PV = "1.8"
 PR = "r0"
 
 SRC_URI = "http://sources.dreamboxupdate.com/download/opendreambox/dreambox-dvb-tools-v3-${PV}.tar.gz"
diff --git a/recipes/dreambox/dreambox-libpassthrough.bb b/recipes/dreambox/dreambox-libpassthrough.bb
new file mode 100644 (file)
index 0000000..dd8ae64
--- /dev/null
@@ -0,0 +1,20 @@
+DESCRIPTION = "Dreambox TS/M2TS audio passthrough helper lib"
+SECTION = "base"
+PRIORITY = "optional"
+LICENSE = "proprietary"
+MAINTAINER = "Andreas Monzner <andreas.monzner@multimedia-labs.de>"
+
+PV = "0.1"
+PR = "r0"
+
+SRC_URI = "http://sources.dreamboxupdate.com/download/7020/libpassthrough-${PV}-${MACHINE}.so"
+
+do_install() {
+       install -d ${D}${libdir}
+       install -m 0755 ${WORKDIR}/libpassthrough-${PV}-${MACHINE}.so ${D}${libdir}/libpassthrough.so
+}
+
+RPROVIDES += "libpassthrough"
+
+PACKAGE_ARCH := "${MACHINE_ARCH}"
+FILES_${PN} = "/"
index 39b4c0d..0e5fdd3 100644 (file)
@@ -2,30 +2,24 @@ DESCRIPTION = "Dreambox second stage bootloader"
 SECTION = "base"
 PRIORITY = "required"
 MAINTAINER = "Felix Domke <tmbinc@elitedvb.net>"
+PV = "82"
+PV_dm500hd = "83"
+PV_dm7025 = "83"
 PV_dm7020 = "35"
-PV_dm7025 = "76"
 PV_dm600pvr = "66"
 PV_dm500plus = "66"
-PV_dm8000 = "76"
-PV_dm800 = "76"
-PV_dm500hd = "80"
-PV_dm800se = "80"
-PV_dm7020hd = "80"
-PR = "r1"
-PR_dm8000 = "r2"
+PR = "r0"
 
-RDEPENDS_dm8000 = "dreambox-bootlogo (>=5.1-r3)"
+RDEPENDS_${PN} = "dreambox-bootlogo (>= 7.0)"
 
 SRC_URI = "http://sources.dreamboxupdate.com/download/7020/secondstage-${MACHINE}-${PV}.bin"
 
+WRITENFI = "writenfi-mipsel-2.6.18-r2"
+
 SECONDSTAGE_UPDATE_SRC = "http://sources.dreamboxupdate.com/download/7020/secondstage-${MACHINE}-${PV}.nfi \
-       http://sources.dreamboxupdate.com/download/7020/writenfi-mipsel-2.6.18-r1"
+       http://sources.dreamboxupdate.com/download/7020/${WRITENFI}"
 
-SRC_URI_append_dm8000 = " ${SECONDSTAGE_UPDATE_SRC}"
-SRC_URI_append_dm800 = " ${SECONDSTAGE_UPDATE_SRC}"
-SRC_URI_append_dm500hd = " ${SECONDSTAGE_UPDATE_SRC}"
-SRC_URI_append_dm800se = " ${SECONDSTAGE_UPDATE_SRC}"
-SRC_URI_append_dm7020hd = " ${SECONDSTAGE_UPDATE_SRC}"
+SRC_URI_append_mipsel = " ${SECONDSTAGE_UPDATE_SRC}"
 
 S = "${WORKDIR}"
 
@@ -34,49 +28,16 @@ do_stage() {
        gzip -c ${S}/secondstage-${MACHINE}-${PV}.bin > ${STAGING_LIBDIR}/dreambox-secondstage/main.bin.gz
 }
 
-# the dm{800,8000,500hd,800se,7020hd} secondstage is already compressed (and encrypted)
-
-do_stage_dm800() {
+# secondstage >= 81 is already compressed
+do_stage_mipsel() {
        install -d ${STAGING_LIBDIR}/dreambox-secondstage
        cp ${S}/secondstage-${MACHINE}-${PV}.bin ${STAGING_LIBDIR}/dreambox-secondstage/main.bin.gz
 }
 
-do_install_dm800() {
+do_install_mipsel() {
        install -d ${D}/tmp
        install ${WORKDIR}/secondstage-${MACHINE}-${PV}.nfi ${D}/tmp/secondstage.nfi
-       install -m 0755 ${WORKDIR}/writenfi-mipsel-2.6.18-r1 ${D}/tmp/writenfi
-}
-
-do_stage_dm8000() {
-       do_stage_dm800
-}
-
-do_install_dm8000() {
-       do_install_dm800
-}
-
-do_stage_dm500hd() {
-       do_stage_dm800
-}
-
-do_install_dm500hd() {
-       do_install_dm800
-}
-
-do_stage_dm800se() {
-       do_stage_dm8000
-}
-
-do_install_dm800se() {
-       do_install_dm800
-}
-
-do_stage_dm7020hd() {
-       do_stage_dm8000
-}
-
-do_install_dm7020hd() {
-       do_install_dm800
+       install -m 0755 ${WORKDIR}/${WRITENFI} ${D}/tmp/writenfi
 }
 
 FILES_${PN} = "/tmp"
index 63a8a0c..306450b 100755 (executable)
@@ -4,8 +4,8 @@ MAINTAINER = "Felix Domke <tmbinc@elitedvb.net>"
 PACKAGES_DYNAMIC = "enigma2-plugin-*"
 
 # if you want experimental, use:
-SRCREV=""
-SRCDATE="20101217"
+SRCREV="87fd2f1120962f553ecb1a88bbee46ed821df975"
+SRCDATE="20110215"
 BRANCH="master"
 PV = "experimental-git${SRCDATE}"
 
index 5e1b1de..09c73b4 100755 (executable)
@@ -4,8 +4,8 @@ MAINTAINER = "Felix Domke <tmbinc@elitedvb.net>"
 PACKAGES_DYNAMIC = "enigma2-skin-*"
 
 # if you want experimental, use:
-SRCREV=""
-SRCDATE="20101211"
+SRCREV="de610a460bec046f0dca9987ecba458303daaf1d"
+SRCDATE="20110128"
 BRANCH="master"
 PV = "experimental-git${SRCDATE}"
 
index 5a77439..aca17df 100644 (file)
@@ -9,7 +9,7 @@ RDEPENDS = "python-codecs python-core python-lang python-re python-threading \
        python-pickle gst-plugin-app \
        gst-plugin-id3demux gst-plugin-mad gst-plugin-ogg gst-plugin-playbin \
        gst-plugin-typefindfunctions gst-plugin-audioconvert gst-plugin-audioresample \
-       gst-plugin-wavparse python-netclient gst-plugin-mpegstream gst-plugin-selector \
+       gst-plugin-wavparse python-netclient gst-plugin-mpegstream \
        gst-plugin-flac gst-plugin-dvbmediasink gst-plugin-mpegdemux gst-plugin-dvdsub \
        gst-plugin-souphttpsrc gst-plugin-mpegaudioparse gst-plugin-subparse \
        gst-plugin-apetag gst-plugin-icydemux gst-plugin-autodetect \
@@ -62,8 +62,9 @@ DESCRIPTION_append_enigma2-plugin-systemplugins-networkwizard = "provides easy s
 PN = "enigma2"
 PR = "r0"
 
-SRCDATE = "20101204"
-SRCDATE_vuplus = "20101204"
+SRCDATE = "20110217"
+SRCDATE_vuplus = "20110217"
+SRCREV = "5e19a3f8a5e8ce8a4e2cb2b601a1b8ef3554e4be"
 #SRCDATE is NOT used by git to checkout a specific revision
 #but we need it to build a ipk package version
 #when you like to checkout a specific revision of e2 you need
@@ -73,7 +74,7 @@ SRCDATE_vuplus = "20101204"
 ####################################################
 BRANCH = "experimental"
 PV = "experimental-git${SRCDATE}"
-SRCREV = ""
+#SRCREV = ""
 ####################################################
 
 # if you want a 2.7-based release, use
@@ -99,6 +100,7 @@ SRCREV_vuplus = ""
 ####################################################
 
 SRC_URI = "git://git.opendreambox.org/git/enigma2.git;protocol=git;branch=${BRANCH};tag=${SRCREV}"
+SRC_URI_append_dm7025 = " file://7025_pvr_device_compatibility.diff;patch=1;pnum=1"
 
 # enigma2_vuplus_mediaplayer.patch is for trick-play in media player
 # enigma2_vuplus_mediaplayer_unpause.patch is for work-around of gstreamer bug 
diff --git a/recipes/enigma2/enigma2/7025_pvr_device_compatibility.diff b/recipes/enigma2/enigma2/7025_pvr_device_compatibility.diff
new file mode 100644 (file)
index 0000000..2708221
--- /dev/null
@@ -0,0 +1,40 @@
+--- a/lib/dvb/demux.cpp
++++ b/lib/dvb/demux.cpp
+@@ -87,9 +87,8 @@ int eDVBDemux::openDemux(void)
+ int eDVBDemux::openDVR(int flags)
+ {
+-      char filename[128];
+-      snprintf(filename, 128, "/dev/dvb/adapter%d/dvr%d", adapter, demux);
+-      return ::open(filename, flags);
++      eDebug("FIXMEEEE.... 7025 drivers doesn't support /dev/dvb/adapterX/dvrX!!!!");
++      return ::open("/dev/misc/pvr", flags);
+ }
+ DEFINE_REF(eDVBDemux)
+--- a/lib/dvb/dvb.cpp
++++ b/lib/dvb/dvb.cpp
+@@ -1798,19 +1798,11 @@ RESULT eDVBChannel::playSource(ePtr<iTsSource> &source, const char *streaminfo_f
+                       return -ENODEV;
+               }
+ #else
+-              ePtr<eDVBAllocatedDemux> &demux = m_demux ? m_demux : m_decoder_demux;
+-              if (demux)
+-              {
+-                      m_pvr_fd_dst = demux->get().openDVR(O_WRONLY);
+-                      if (m_pvr_fd_dst < 0)
+-                      {
+-                              eDebug("can't open /dev/dvb/adapterX/dvrX - you need to buy the new(!) $$$ box! (%m)"); // or wait for the driver to be improved.
+-                              return -ENODEV;
+-                      }
+-              }
+-              else
++              eDebug("FIXMEEEE.... 7025 drivers doesn't support /dev/dvb/adapterX/dvrX!!!!");
++              m_pvr_fd_dst = open("/dev/misc/pvr", O_WRONLY);
++              if (m_pvr_fd_dst < 0)
+               {
+-                      eDebug("no demux allocated yet.. so its not possible to open the dvr device!!");
++                      eDebug("can't open /dev/misc/pvr - you need to buy the new(!) $$$ box! (%m)"); // or wait for the driver to be improved.
+                       return -ENODEV;
+               }
+ #endif
diff --git a/recipes/enigma2/enigma2/enigma2.sh b/recipes/enigma2/enigma2/enigma2.sh
deleted file mode 100644 (file)
index b9fb45e..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-/usr/bin/showiframe /boot/backdrop.mvi
-
-cd /home/root
-LD_PRELOAD=/usr/lib/libopen.so.0.0 /usr/bin/enigma2
-
-# enigma2 exit codes:
-#
-# 0 - restart enigma
-# 1 - halt
-# 2 - reboot
-#
-# >128 signal
-
-ret=$?
-case $ret in
-       1)
-               /sbin/halt
-               ;;
-       2)
-               /sbin/reboot
-               ;;
-       4)
-               /sbin/rmmod lcd
-               /usr/sbin/fpupgrade --upgrade 2>&1 | tee /home/root/fpupgrade.log
-               sleep 1;
-               /sbin/rmmod fp
-               /sbin/modprobe fp
-               /sbin/reboot
-               ;;
-       *)
-               ;;
-esac
diff --git a/recipes/enigma2/enigma2/fix-dvdburn-pathes.patch b/recipes/enigma2/enigma2/fix-dvdburn-pathes.patch
deleted file mode 100644 (file)
index ba1c1c5..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py
-+++ b/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py
-@@ -68,7 +68,7 @@ class DVDToolbox(Screen):
-               self["info"].text = ""
-               self["details"].setText("")
-               self.Console = Console()
--              cmd = "/bin/dvd+rw-mediainfo /dev/" + harddiskmanager.getCD()
-+              cmd = "/usr/bin/dvd+rw-mediainfo /dev/" + harddiskmanager.getCD()
-               self.Console.ePopen(cmd, self.mediainfoCB)
-       def format(self):
-@@ -186,7 +186,7 @@ class DVDformatTask(Task):
-               Task.__init__(self, job, ("RW medium format"))
-               self.toolbox = job.toolbox
-               self.postconditions.append(DVDformatTaskPostcondition())
--              self.setTool("/bin/dvd+rw-format")
-+              self.setTool("/usr/bin/dvd+rw-format")
-               self.args += [ "/dev/" + harddiskmanager.getCD() ]
-               self.end = 1100
-               self.retryargs = [ ]
---- a/lib/python/Plugins/Extensions/DVDBurn/Process.py
-+++ b/lib/python/Plugins/Extensions/DVDBurn/Process.py
-@@ -292,7 +292,7 @@ class BurnTaskPostcondition(Condition):
- class BurnTask(Task):
-       ERROR_NOTWRITEABLE, ERROR_LOAD, ERROR_SIZE, ERROR_WRITE_FAILED, ERROR_DVDROM, ERROR_ISOFS, ERROR_FILETOOLARGE, ERROR_ISOTOOLARGE, ERROR_MINUSRWBUG, ERROR_UNKNOWN = range(10)
--      def __init__(self, job, extra_args=[], tool="/bin/growisofs"):
-+      def __init__(self, job, extra_args=[], tool="/usr/bin/growisofs"):
-               Task.__init__(self, job, job.name)
-               self.weighting = 500
-               self.end = 120 # 100 for writing, 10 for buffer flush, 10 for closing disc
-@@ -882,7 +882,7 @@ class DVDJob(Job):
-                       volName = self.project.settings.name.getValue()
-                       if output == "dvd":
-                               self.name = _("Burn DVD")
--                              tool = "/bin/growisofs"
-+                              tool = "/usr/bin/growisofs"
-                               burnargs = [ "-Z", "/dev/" + harddiskmanager.getCD(), "-dvd-compat" ]
-                               if self.project.size/(1024*1024) > self.project.MAX_SL:
-                                       burnargs += [ "-use-the-force-luke=4gms", "-speed=1", "-R" ]
-@@ -920,7 +920,7 @@ class DVDdataJob(Job):
-               output = self.project.settings.output.getValue()
-               volName = self.project.settings.name.getValue()
--              tool = "/bin/growisofs"
-+              tool = "/usr/bin/growisofs"
-               if output == "dvd":
-                       self.name = _("Burn DVD")
-                       burnargs = [ "-Z", "/dev/" + harddiskmanager.getCD(), "-dvd-compat" ]
-@@ -959,5 +959,5 @@ class DVDisoJob(Job):
-                       if getSize(imagepath)/(1024*1024) > self.project.MAX_SL:
-                               burnargs += [ "-use-the-force-luke=4gms", "-speed=1", "-R" ]
-                       burnargs += [ "-dvd-video", "-publisher", "Dreambox", "-V", volName, imagepath ]
--              tool = "/bin/growisofs"
-+              tool = "/usr/bin/growisofs"
-               BurnTask(self, burnargs, tool)
diff --git a/recipes/enigma2/enigma2/new-hotplug.patch b/recipes/enigma2/enigma2/new-hotplug.patch
deleted file mode 100644 (file)
index 00b5235..0000000
+++ /dev/null
@@ -1,601 +0,0 @@
---- a/lib/python/Components/Harddisk.py
-+++ b/lib/python/Components/Harddisk.py
-@@ -11,17 +11,17 @@ def readFile(filename):
-       file.close()
-       return data
--class Harddisk:
--      DEVTYPE_UDEV = 0
--      DEVTYPE_DEVFS = 1
-+DEVTYPE_UDEV = 0
-+DEVTYPE_DEVFS = 1
-+class Harddisk:
-       def __init__(self, device):
-               self.device = device
-               if access("/dev/.udev", 0):
--                      self.type = self.DEVTYPE_UDEV
-+                      self.type = DEVTYPE_UDEV
-               elif access("/dev/.devfsd", 0):
--                      self.type = self.DEVTYPE_DEVFS
-+                      self.type = DEVTYPE_DEVFS
-               else:
-                       print "Unable to determine structure of /dev"
-@@ -33,11 +33,11 @@ class Harddisk:
-               self.disk_path = ''
-               self.phys_path = path.realpath(self.sysfsPath('device'))
--              if self.type == self.DEVTYPE_UDEV:
-+              if self.type == DEVTYPE_UDEV:
-                       self.dev_path = '/dev/' + self.device
-                       self.disk_path = self.dev_path
--              elif self.type == self.DEVTYPE_DEVFS:
-+              elif self.type == DEVTYPE_DEVFS:
-                       tmp = readFile(self.sysfsPath('dev')).split(':')
-                       s_major = int(tmp[0])
-                       s_minor = int(tmp[1])
-@@ -60,9 +60,9 @@ class Harddisk:
-               return self.device < ob.device
-       def partitionPath(self, n):
--              if self.type == self.DEVTYPE_UDEV:
-+              if self.type == DEVTYPE_UDEV:
-                       return self.dev_path + n
--              elif self.type == self.DEVTYPE_DEVFS:
-+              elif self.type == DEVTYPE_DEVFS:
-                       return self.dev_path + '/part' + n
-       def sysfsPath(self, filename):
-@@ -75,9 +75,9 @@ class Harddisk:
-       def bus(self):
-               # CF (7025 specific)
--              if self.type == self.DEVTYPE_UDEV:
-+              if self.type == DEVTYPE_UDEV:
-                       ide_cf = False  # FIXME
--              elif self.type == self.DEVTYPE_DEVFS:
-+              elif self.type == DEVTYPE_DEVFS:
-                       ide_cf = self.device[:2] == "hd" and "host0" not in self.dev_path
-               internal = "pci" in self.phys_path
-@@ -136,7 +136,7 @@ class Harddisk:
-       def numPartitions(self):
-               numPart = -1
--              if self.type == self.DEVTYPE_UDEV:
-+              if self.type == DEVTYPE_UDEV:
-                       try:
-                               devdir = listdir('/dev')
-                       except OSError:
-@@ -145,7 +145,7 @@ class Harddisk:
-                               if filename.startswith(self.device):
-                                       numPart += 1
--              elif self.type == self.DEVTYPE_DEVFS:
-+              elif self.type == DEVTYPE_DEVFS:
-                       try:
-                               idedir = listdir(self.dev_path)
-                       except OSError:
-@@ -394,24 +394,38 @@ class Partition:
-                               return True
-               return False
--DEVICEDB =  \
-+DEVICEDB_SR = \
-       {"dm8000":
-               {
--                      # dm8000:
--                      "/devices/platform/brcm-ehci.0/usb1/1-1/1-1.1/1-1.1:1.0": "Front USB Slot",
--                      "/devices/platform/brcm-ehci.0/usb1/1-1/1-1.2/1-1.2:1.0": "Back, upper USB Slot",
--                      "/devices/platform/brcm-ehci.0/usb1/1-1/1-1.3/1-1.3:1.0": "Back, lower USB Slot",
--                      "/devices/platform/brcm-ehci-1.1/usb2/2-1/2-1:1.0/host1/target1:0:0/1:0:0:0": "DVD Drive",
-+                      "/devices/pci0000:01/0000:01:00.0/host0/target0:0:0/0:0:0:0": _("DVD Drive"),
-+                      "/devices/pci0000:01/0000:01:00.0/host1/target1:0:0/1:0:0:0": _("DVD Drive"),
-+                      "/devices/platform/brcm-ehci-1.1/usb2/2-1/2-1:1.0/host3/target3:0:0/3:0:0:0": _("DVD Drive"),
-+              },
-+      "dm800":
-+      {
-+      },
-+      "dm7025":
-+      {
-+      }
-+      }
-+
-+DEVICEDB = \
-+      {"dm8000":
-+              {
-+                      "/devices/platform/brcm-ehci.0/usb1/1-1/1-1.1/1-1.1:1.0": _("Front USB Slot"),
-+                      "/devices/platform/brcm-ehci.0/usb1/1-1/1-1.2/1-1.2:1.0": _("Back, upper USB Slot"),
-+                      "/devices/platform/brcm-ehci.0/usb1/1-1/1-1.3/1-1.3:1.0": _("Back, lower USB Slot"),
-+                      "/devices/platform/brcm-ehci.0/usb1/1-1/1-1.1/1-1.1:1.0": _("Front USB Slot"),
-+                      "/devices/platform/brcm-ehci-1.1/usb2/2-1/2-1:1.0/": _("Internal USB Slot"),
-+                      "/devices/platform/brcm-ohci-1.1/usb4/4-1/4-1:1.0/": _("Internal USB Slot"),
-               },
-       "dm800":
-       {
--              # dm800:
-               "/devices/platform/brcm-ehci.0/usb1/1-2/1-2:1.0": "Upper USB Slot",
-               "/devices/platform/brcm-ehci.0/usb1/1-1/1-1:1.0": "Lower USB Slot",
-       },
-       "dm7025":
-       {
--              # dm7025:
-               "/devices/pci0000:00/0000:00:14.1/ide1/1.0": "CF Card Slot", #hdc
-               "/devices/pci0000:00/0000:00:14.1/ide0/0.0": "Internal Harddisk"
-       }
-@@ -422,6 +436,7 @@ class HarddiskManager:
-               self.hdd = [ ]
-               self.cd = ""
-               self.partitions = [ ]
-+              self.devices_scanned_on_init = [ ]
-               self.on_partition_list_change = CList()
-@@ -489,24 +504,23 @@ class HarddiskManager:
-       def enumerateBlockDevices(self):
-               print "enumerating block devices..."
-               for blockdev in listdir("/sys/block"):
--                      error, blacklisted, removable, is_cdrom, partitions, medium_found = self.getBlockDevInfo(blockdev)
--                      print "found block device '%s':" % blockdev, 
--                      if error:
--                              print "error querying properties"
--                      elif blacklisted:
--                              print "blacklisted"
--                      elif not medium_found:
--                              print "no medium"
--                      else:
--                              print "ok, removable=%s, cdrom=%s, partitions=%s, device=%s" % (removable, is_cdrom, partitions, blockdev)
--
--                              self.addHotplugPartition(blockdev)
--                              for part in partitions:
--                                      self.addHotplugPartition(part)
-+                      error, blacklisted, removable, is_cdrom, partitions, medium_found = self.addHotplugPartition(blockdev)
-+                      if not error and not blacklisted:
-+                              if medium_found:
-+                                      for part in partitions:
-+                                              self.addHotplugPartition(part)
-+                              self.devices_scanned_on_init.append((blockdev, removable, is_cdrom, medium_found))
-       def getAutofsMountpoint(self, device):
-               return "/autofs/%s/" % (device)
-+      def is_hard_mounted(self, device):
-+              mounts = file('/proc/mounts').read().split('\n')
-+              for x in mounts:
-+                      if x.find('/autofs') == -1 and x.find(device) != -1:
-+                              return True
-+              return False
-+
-       def addHotplugPartition(self, device, physdev = None):
-               if not physdev:
-                       dev, part = self.splitDeviceName(device)
-@@ -516,22 +530,36 @@ class HarddiskManager:
-                               physdev = dev
-                               print "couldn't determine blockdev physdev for device", device
--              # device is the device name, without /dev
--              # physdev is the physical device path, which we (might) use to determine the userfriendly name
--              description = self.getUserfriendlyDeviceName(device, physdev)
-+              error, blacklisted, removable, is_cdrom, partitions, medium_found = self.getBlockDevInfo(device)
-+              print "found block device '%s':" % device,
--              p = Partition(mountpoint = self.getAutofsMountpoint(device), description = description, force_mounted = True, device = device)
--              self.partitions.append(p)
--              self.on_partition_list_change("add", p)
-+              if blacklisted:
-+                      print "blacklisted"
-+              else:
-+                      if error:
-+                              print "error querying properties"
-+                      elif not medium_found:
-+                              print "no medium"
-+                      else:
-+                              print "ok, removable=%s, cdrom=%s, partitions=%s" % (removable, is_cdrom, partitions)
-+
-+                      l = len(device)
-+                      if l:
-+                              # see if this is a harddrive
-+                              if not device[l-1].isdigit() and not removable and not is_cdrom:
-+                                      self.hdd.append(Harddisk(device))
-+                                      self.hdd.sort()
-+                                      SystemInfo["Harddisk"] = len(self.hdd) > 0
-+
-+                              if (not removable or medium_found) and not self.is_hard_mounted(device):
-+                                      # device is the device name, without /dev
-+                                      # physdev is the physical device path, which we (might) use to determine the userfriendly name
-+                                      description = self.getUserfriendlyDeviceName(device, physdev)
-+                                      p = Partition(mountpoint = self.getAutofsMountpoint(device), description = description, force_mounted = True, device = device)
-+                                      self.partitions.append(p)
-+                                      self.on_partition_list_change("add", p)
--              # see if this is a harddrive
--              l = len(device)
--              if l and not device[l-1].isdigit():
--                      error, blacklisted, removable, is_cdrom, partitions, medium_found = self.getBlockDevInfo(device)
--                      if not blacklisted and not removable and not is_cdrom and medium_found:
--                              self.hdd.append(Harddisk(device))
--                              self.hdd.sort()
--                              SystemInfo["Harddisk"] = len(self.hdd) > 0
-+              return error, blacklisted, removable, is_cdrom, partitions, medium_found
-       def removeHotplugPartition(self, device):
-               mountpoint = self.getAutofsMountpoint(device)
-@@ -589,15 +617,23 @@ class HarddiskManager:
-       def getUserfriendlyDeviceName(self, dev, phys):
-               dev, part = self.splitDeviceName(dev)
-               description = "External Storage %s" % dev
-+              have_model_descr = False
-               try:
-                       description = readFile("/sys" + phys + "/model")
-+                      have_model_descr = True
-               except IOError, s:
-                       print "couldn't read model: ", s
-               from Tools.HardwareInfo import HardwareInfo
--              for physdevprefix, pdescription in DEVICEDB.get(HardwareInfo().device_name,{}).items():
-+              if dev.find('sr') == 0 and dev[2].isdigit():
-+                      devicedb = DEVICEDB_SR
-+              else:
-+                      devicedb = DEVICEDB
-+              for physdevprefix, pdescription in devicedb.get(HardwareInfo().device_name,{}).items():
-                       if phys.startswith(physdevprefix):
--                              description = pdescription
--
-+                              if have_model_descr:
-+                                      description = pdescription + ' - ' + description
-+                              else:
-+                                      description = pdescription
-               # not wholedisk and not partition 1
-               if part and part != 1:
-                       description += " (Partition %d)" % part
---- a/lib/python/Plugins/SystemPlugins/Hotplug/plugin.py
-+++ b/lib/python/Plugins/SystemPlugins/Hotplug/plugin.py
-@@ -1,66 +1,300 @@
- from Plugins.Plugin import PluginDescriptor
--from twisted.internet.protocol import Protocol, Factory
--from twisted.internet import reactor
- from Components.Harddisk import harddiskmanager
-+from Tools.Directories import fileExists
- hotplugNotifier = [ ]
-+bdpoll = None
--class Hotplug(Protocol):
--      def connectionMade(self):
--              self.received = ""
-+def processHotplugData(self, v):
-+      print "hotplug:", v
-+      action = v.get("ACTION")
-+      device = v.get("DEVPATH")
-+      physdevpath = v.get("PHYSDEVPATH")
-+      media_state = v.get("X_E2_MEDIA_STATUS")
--      def dataReceived(self, data):
--              self.received += data
-+      dev = device.split('/')[-1]
--      def connectionLost(self, reason):
--              data = self.received.split('\0')[:-1]
-+      if action is not None and action == "add":
-+              error, blacklisted, removable, is_cdrom, partitions, medium_found = harddiskmanager.addHotplugPartition(dev, physdevpath)
-+              if bdpoll and removable or is_cdrom:
-+                      bdpoll.addDevice(dev, is_cdrom, medium_found)
-+      elif action is not None and action == "remove":
-+              if bdpoll:
-+                      bdpoll.removeDevice(dev)
-+              harddiskmanager.removeHotplugPartition(dev)
-+      elif media_state is not None:
-+              if media_state == '1':
-+                      harddiskmanager.removeHotplugPartition(dev)
-+                      harddiskmanager.addHotplugPartition(dev, physdevpath)
-+              elif media_state == '0':
-+                      harddiskmanager.removeHotplugPartition(dev)
--              v = {}
-+      for callback in hotplugNotifier:
-+              try:
-+                      callback(dev, action or media_state)
-+              except AttributeError:
-+                      hotplugNotifier.remove(callback)
--              for x in data:
--                      i = x.find('=')
--                      var, val = x[:i], x[i+1:]
--                      v[var] = val
-+CDROM_DRIVE_STATUS = 0x5326
-+CDROM_MEDIA_CHANGED = 0x5325
-+CDSL_CURRENT = ((int)(~0>>1))
-+CDS_NO_INFO = 0
-+CDS_NO_DISC = 1
-+CDS_TRAY_OPEN = 2
-+CDS_DRIVE_NOT_READY = 3
-+CDS_DISC_OK = 4
-+ENOMEDIUM = 159
-+IOC_NRBITS = 8
-+IOC_NRSHIFT = 0
-+IOC_TYPESHIFT = (IOC_NRSHIFT+IOC_NRBITS)
-+BLKRRPART = ((0x12<<IOC_TYPESHIFT) | (95<<IOC_NRSHIFT))
--              print "hotplug:", v
-+def autostart(reason, **kwargs):
-+      if reason == 0:
-+              print "starting hotplug handler"
--              action = v.get("ACTION")
--              device = v.get("DEVPATH")
--              physdevpath = v.get("PHYSDEVPATH")
--              media_state = v.get("X_E2_MEDIA_STATUS")
-+              if fileExists('/dev/.udev'):
-+                      global netlink
-+                      global bdpoll
-+                      from enigma import eSocketNotifier, eTimer, ePythonMessagePump
-+                      import socket
-+                      from select import POLLIN, POLLPRI
--              dev = device.split('/')[-1]
-+                      class Netlink:
-+                              def __init__(self):
-+                                      self.netlink = socket.socket(socket.AF_NETLINK, socket.SOCK_DGRAM, 15)
-+                                      self.netlink.setsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF, 65536)
-+                                      self.netlink.setsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF, 65536)
-+                                      self.netlink.bind((0, 1))
-+                                      self.sn = eSocketNotifier(self.netlink.fileno(), POLLIN|POLLPRI)
-+                                      self.sn.callback.append(self.dataAvail)
--              if action is not None and action == "add":
--                      harddiskmanager.addHotplugPartition(dev, physdevpath)
--              elif action is not None and action == "remove":
--                      harddiskmanager.removeHotplugPartition(dev)
--              elif media_state is not None:
--                      if media_state == '1':
--                              harddiskmanager.removeHotplugPartition(dev)
--                              harddiskmanager.addHotplugPartition(dev, physdevpath)
--                      elif media_state == '0':
--                              harddiskmanager.removeHotplugPartition(dev)
--              
--              for callback in hotplugNotifier:
--                      try:
--                              callback(dev, action or media_state)
--                      except AttributeError:
--                              hotplugNotifier.remove(callback)
-+                              def dataAvail(self, what):
-+                                      received = self.netlink.recvfrom(16384)
-+#                                     print "HOTPLUG(%d):" %(what), received
--def autostart(reason, **kwargs):
--      if reason == 0:
--              print "starting hotplug handler"
--              factory = Factory()
--              factory.protocol = Hotplug
-+                                      data = received[0].split('\0')[:-1]
-+                                      v = {}
-+
-+                                      for x in data:
-+                                              i = x.find('=')
-+                                              var, val = x[:i], x[i+1:]
-+                                              v[var] = val
-+
-+                                      if v['SUBSYSTEM'] == 'block' and v['ACTION'] in ('add', 'remove'):
-+                                              processHotplugData(self, v)
-+
-+                      from threading import Thread, Semaphore, Lock
-+
-+                      class ThreadQueue:
-+                              def __init__(self):
-+                                      self.__list = [ ]
-+                                      self.__lock = Lock()
-+
-+                              def push(self, val):
-+                                      list = self.__list
-+                                      lock = self.__lock
-+                                      lock.acquire()
-+                                      list.append(val)
-+                                      lock.release()
-+
-+                              def pop(self):
-+                                      list = self.__list
-+                                      lock = self.__lock
-+                                      lock.acquire()
-+                                      ret = list[0]
-+                                      del list[0]
-+                                      lock.release()
-+                                      return ret
--              try:
-                       import os
--                      os.remove("/tmp/hotplug.socket")
--              except OSError:
--                      pass
-+                      import errno
-+                      import fcntl
-+
-+                      class BDPoll(Thread):
-+                              CHECK_INTERVAL = 2000
-+                              MSG_MEDIUM_REMOVED = 1
-+                              MSG_MEDIUM_INSERTED = 2
-+                              MSG_POLL_FINISHED = 4
-+                              def __init__(self):
-+                                      Thread.__init__(self)
-+                                      self.__sema = Semaphore(0)
-+                                      self.__lock = Lock()
-+                                      self.running = False
-+                                      self.devices_to_poll = { }
-+                                      self.messages = ThreadQueue()
-+                                      self.checkTimer = eTimer()
-+                                      self.checkTimer.callback.append(self.timeout)
-+                                      self.checkTimer.start(BDPoll.CHECK_INTERVAL, True)
-+                                      self.mp = ePythonMessagePump()
-+                                      self.mp.recv_msg.get().append(self.gotThreadMsg)
-+                                      self.start()
-+
-+                              def gotThreadMsg(self, msg):
-+                                      msg = self.messages.pop()
-+                                      if msg[0] == BDPoll.MSG_MEDIUM_REMOVED:
-+                                              print "MSG_MEDIUM_REMOVED"
-+                                              harddiskmanager.removeHotplugPartition(msg[1])
-+                                      elif msg[0] == BDPoll.MSG_MEDIUM_INSERTED:
-+                                              print "MSG_MEDIUM_INSERTED"
-+                                              harddiskmanager.addHotplugPartition(msg[1])
-+                                      elif msg[0] == BDPoll.MSG_POLL_FINISHED:
-+                                              self.checkTimer.start(BDPoll.CHECK_INTERVAL, True)
-+
-+                              def timeout(self):
-+                                      self.__sema.release() # start bdpoll loop in thread
-+
-+                              def is_mounted(self, dev):
-+                                      mounts = file('/proc/mounts').read()
-+                                      return mounts.find(dev) != -1
-+
-+                              def run(self):
-+                                      sema = self.__sema
-+                                      lock = self.__lock
-+                                      messages = self.messages
-+                                      mp = self.mp
-+                                      self.running = True
-+                                      while self.running:
-+                                              sema.acquire()
-+                                              self.__lock.acquire()
-+                                              devices_to_poll = self.devices_to_poll.items()
-+                                              self.__lock.release()
-+                                              devices_to_poll_processed = [ ]
-+                                              for device, state in devices_to_poll:
-+                                                      got_media = False
-+                                                      is_cdrom, prev_media_state = state
-+                                                      if is_cdrom:
-+                                                              try:
-+                                                                      fd = os.open("/dev/" + device, os.O_RDONLY | os.O_NONBLOCK | os.O_EXCL)
-+                                                              except OSError, err:
-+                                                                      if err.errno == errno.EBUSY:
-+                                                                              print "open cdrom exclusive failed:",
-+                                                                              if not self.is_mounted(device):
-+                                                                                      print "not mounted"
-+                                                                                      continue
-+                                                                              try:
-+                                                                                      print "mounted... try non exclusive"
-+                                                                                      fd = os.open("/dev/" + device, os.O_RDONLY | os.O_NONBLOCK)
-+                                                                              except OSError, err:
-+                                                                                      print "open cdrom not exclusive failed", os.strerror(err.errno)
-+                                                                                      continue
-+                                                              #here the fs must be valid!
-+                                                              try:
-+                                                                      ret = fcntl.ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT)
-+                                                              except IOError, err:
-+                                                                      print "ioctl CDROM_DRIVE_STATUS failed", os.strerror(err.errno)
-+                                                              else:
-+                                                                      if ret in (CDS_NO_INFO, CDS_NO_DISC, CDS_TRAY_OPEN, CDS_DRIVE_NOT_READY):
-+                                                                              pass
-+                                                                      elif ret == CDS_DISC_OK:
-+                                                                              #todo new kernels support events to userspace event on media change
-+                                                                              #but not 2.6.18.... see hotplug-ng bdpoll.c
-+                                                                              got_media = True
-+                                                              os.close(fd)
-+                                                      else:
-+                                                              try:
-+                                                                      fd = os.open("/dev/" + device, os.O_RDONLY)
-+                                                              except OSError, err:
-+                                                                      if err.errno == ENOMEDIUM:
-+                                                                              pass
-+                                                                      else:
-+                                                                              print "open non cdrom failed", os.strerror(err.errno)
-+                                                                              continue
-+                                                              else:
-+                                                                      got_media = True
-+                                                                      os.close(fd)
-+                                                      if prev_media_state:
-+                                                              if not got_media:
-+                                                                      print "media removal detected on", device
-+                                                                      try:
-+                                                                              fd = os.open("/dev/" + device, os.O_RDONLY | os.O_NONBLOCK)
-+                                                                      except OSError, err:
-+                                                                              print "open device for blkrrpart ioctl failed", os.strerror(err.errno)
-+                                                                      else:
-+                                                                              try:
-+                                                                                      fcntl.ioctl(fd, BLKRRPART)
-+                                                                              except IOError, err:
-+                                                                                      print "ioctl BLKRRPART failed", os.strerror(err.errno)
-+                                                                              os.close(fd)
-+                                                      else:
-+                                                              if got_media:
-+                                                                      print "media insertion detected on", device
-+                                                      devices_to_poll_processed.append((device, is_cdrom, got_media))
-+                                              self.__lock.acquire()
-+                                              for device, is_cdrom, state in devices_to_poll_processed:
-+                                                      old_state = self.devices_to_poll.get(device)
-+                                                      if old_state is not None and old_state[1] != state:
-+                                                              msg = state and BDPoll.MSG_MEDIUM_INSERTED or BDPoll.MSG_MEDIUM_REMOVED
-+                                                              self.devices_to_poll[device] = (is_cdrom, state)
-+                                                              messages.push((msg, device))
-+                                                              mp.send(0)
-+
-+                                              self.__lock.release()
-+                                              messages.push((self.MSG_POLL_FINISHED,))
-+                                              mp.send(0)
-+
-+                              def addDevice(self, device, is_cdrom, inserted):
-+                                      self.__lock.acquire()
-+                                      if device in self.devices_to_poll:
-+                                              print "device", device, "already in bdpoll"
-+                                      else:
-+                                              print "add device", device, "to bdpoll current state:",
-+                                              if inserted:
-+                                                      print "medium inserted"
-+                                              else:
-+                                                      print "medium removed"
-+                                              self.devices_to_poll[device] = (is_cdrom, inserted)
-+                                      self.__lock.release()
-+
-+                              def removeDevice(self, device):
-+                                      self.__lock.acquire()
-+                                      if device in self.devices_to_poll:
-+                                              print "device", device, "removed from bdpoll"
-+                                              del self.devices_to_poll[device]
-+                                      else:
-+                                              print "try to del not exist device", device, "from bdpoll"
-+                                      self.__lock.release()
-+
-+                      netlink = Netlink()
-+                      bdpoll = BDPoll()
-+                      for blockdev, removable, is_cdrom, medium_found in harddiskmanager.devices_scanned_on_init:
-+                              if removable or is_cdrom:
-+                                      bdpoll.addDevice(blockdev, is_cdrom, medium_found)
-+              else:
-+                      from twisted.internet.protocol import Protocol, Factory
-+                      from twisted.internet import reactor
-+
-+                      try:
-+                              import os
-+                              os.remove("/tmp/hotplug.socket")
-+                      except OSError:
-+                              pass
-+
-+                      class Hotplug(Protocol):
-+                              def connectionMade(self):
-+                                      print "HOTPLUG connection!"
-+                                      self.received = ""
-+
-+                              def dataReceived(self, data):
-+                                      print "hotplug:", data
-+                                      self.received += data
-+                                      print "complete", self.received
-+
-+                              def connectionLost(self, reason):
-+                                      print "HOTPLUG connection lost!"
-+                                      data = self.received.split('\0')[:-1]
-+                                      v = {}
-+
-+                                      for x in data:
-+                                              i = x.find('=')
-+                                              var, val = x[:i], x[i+1:]
-+                                              v[var] = val
-+
-+                                      processHotplugData(self, v)
--              reactor.listenUNIX("/tmp/hotplug.socket", factory)
-+                      factory = Factory()
-+                      factory.protocol = Hotplug
-+                      reactor.listenUNIX("/tmp/hotplug.socket", factory)
- def Plugins(**kwargs):
-       return PluginDescriptor(name = "Hotplug", description = "listens to hotplug events", where = PluginDescriptor.WHERE_AUTOSTART, fnc = autostart)
index cf495fe..d05b230 100644 (file)
@@ -3,19 +3,21 @@ SECTION = "multimedia"
 PRIORITY = "optional"
 MAINTAINER = "Felix Domke <tmbinc@openembedded.org>"
 DEPENDS = "gstreamer gst-plugins-base"
-PV = "0.10+cvs${SRCDATE}"
-PR = "r1"
 
-inherit autotools pkgconfig
+SRCREV="15a323fd769d4546bc454bfd81848aa43d655f3d"
+SRCDATE="20110210"
+BRANCH="master"
+PV = "0.10+git${SRCDATE}"
+PR = "r0"
 
-SRCDATE = "20101106"
+inherit autotools pkgconfig
 
-SRC_URI = "cvs://anonymous@cvs.schwerkraft.elitedvb.net/cvsroot/dvbmediasink;module=dvbmediasink;method=pserver"
+SRC_URI = "git://schwerkraft.elitedvb.net/dvbmediasink/dvbmediasink.git;protocol=git;branch=${BRANCH};tag=${SRCREV}"
 
 SRC_URI_append_vuplus = " \
                file://fix_dvbaudiosink_async_opt.patch;patch=1;pnum=1"
 
-S = "${WORKDIR}/dvbmediasink"
+S = "${WORKDIR}/git"
 
 FILES_${PN} = "${libdir}/gstreamer-0.10/*.so*"
 FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la \
diff --git a/recipes/gstreamer/gst-plugins-bad_0.10.21.bb b/recipes/gstreamer/gst-plugins-bad_0.10.21.bb
new file mode 100644 (file)
index 0000000..0a6aa89
--- /dev/null
@@ -0,0 +1,15 @@
+require gst-plugins.inc
+
+PR = "${INC_PR}.0"
+
+do_configure_prepend() {
+    sed -i -e s:docs::g Makefile.am
+}
+
+DEPENDS += "gst-plugins-base"
+
+EXTRA_OECONF_opendreambox += "--disable-apexsink --disable-dvdnav --disable-cdaudio --disable-mpeg2enc --disable-mplex --disable-librfb"
+
+SRC_URI_append_opendreambox += " file://mpegpsdemux-speedup.diff;patch=1;pnum=0 \
+                                file://mpegtsdemux-fix-bd-streamtype-detection.diff;patch=1;pnum=1 \
+"
diff --git a/recipes/gstreamer/gst-plugins-base_0.10.32.bb b/recipes/gstreamer/gst-plugins-base_0.10.32.bb
new file mode 100644 (file)
index 0000000..6aeb18f
--- /dev/null
@@ -0,0 +1,15 @@
+require gst-plugins.inc
+
+SRC_URI_append_opendreambox = " file://samihack.patch;patch=1"
+
+PR = "${INC_PR}.0"
+
+PROVIDES += "gst-plugins"
+
+# gst-plugins-base only builds the alsa plugin
+# if alsa has been built and is present.  You will
+# not get an error if this is not present, just 
+# a missing alsa plugin
+DEPENDS += "${@base_contains('DISTRO', 'opendreambox', 'alsa-lib', 'cdparanoia pango libtheora alsa-lib libsm virtual/libx11 freetype gnome-vfs libxv', d)}"
+EXTRA_OECONF_opendreambox += "--disable-theora --disable-pango --with-audioresample-format=int"
+
diff --git a/recipes/gstreamer/gst-plugins-good_0.10.27.bb b/recipes/gstreamer/gst-plugins-good_0.10.27.bb
new file mode 100644 (file)
index 0000000..74c7915
--- /dev/null
@@ -0,0 +1,10 @@
+require gst-plugins.inc
+
+PR = "${INC_PR}.0"
+
+DEPENDS += "gst-plugins-base"
+
+do_configure_prepend() {
+       sed -i -e s:docs::g Makefile.am
+}
+
diff --git a/recipes/gstreamer/gst-plugins-ugly_0.10.17.bb b/recipes/gstreamer/gst-plugins-ugly_0.10.17.bb
new file mode 100644 (file)
index 0000000..7cb481a
--- /dev/null
@@ -0,0 +1,15 @@
+require gst-plugins.inc
+
+SRC_URI_append_opendreambox = " file://dvdsubdec-addproperty-singlebuffer.patch;patch=1"
+
+PR = "${INC_PR}.0"
+
+DEPENDS += "gst-plugins-base libsidplay"
+
+python() {
+       # Don't build, if we are building an ENTERPRISE distro
+       enterprise = bb.data.getVar("ENTERPRISE_DISTRO", d, 1)
+       if enterprise == "1":
+               raise bb.parse.SkipPackage("gst-plugins-ugly will only build if ENTERPRISE_DISTRO != 1")
+}
+
index 228af90..d37f901 100755 (executable)
@@ -5,7 +5,7 @@ DEPENDS += "${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag'
 DEPENDS += "${@base_conditional('DISTRO', 'opendreambox', 'libmad libsoup-2.4 flac libmatroska libcdio libid3tag', '', d)}"
 DEPENDS += "${@base_conditional('DISTRO', 'vuplus', 'libmad libsoup-2.4 flac libmatroska libcdio libid3tag', '', d)}"
 
-INC_PR = "r1"
+INC_PR = "r0"
 
 PACKAGES_DYNAMIC = "gst-plugin-*"
 
diff --git a/recipes/gstreamer/gstreamer_0.10.32.bb b/recipes/gstreamer/gstreamer_0.10.32.bb
new file mode 100644 (file)
index 0000000..5994efe
--- /dev/null
@@ -0,0 +1,10 @@
+require gstreamer.inc
+
+EXTRA_OECONF += "ac_cv_func_register_printf_function=no"
+
+do_configure_prepend() {
+       sed -i -e s:docs::g Makefile.am
+}
+
+RREPLACES_gstreamer = "gst-plugin-queue2 gst-plugin-selector"
+RCONFLICTS_gstreamer = "gst-plugin-queue2 gst-plugin-selector"
index f62a8a7..812f0ac 100644 (file)
@@ -7,7 +7,7 @@ RCONFLICTS_${PN} = "hotplug"
 RREPLACES_${PN} = "hotplug"
 
 SRC_URI = "svn://svn.schwerkraft.elitedvb.net/svnroot;module=hotplug-ng"
-SRCDATE = "20080527"
+SRCDATE = "20100119"
 PV = "002+svn${SRCDATE}"
 
 S = "${WORKDIR}/hotplug-ng/trunk"
index 687641a..08c36cb 100644 (file)
@@ -1,8 +1,6 @@
 echo 4 > /proc/progress
 mount -t devfs devfs /dev
-
-mknod /dev/hda1 b 3 1
-mknod /dev/hdc1 b 22 1
+devfsd /dev
 
 echo 12 > /proc/progress
 [ -e /dev/dbox/oled0 ] && ln -s /dev/dbox/oled0 /dev/dbox/lcd0
@@ -27,6 +25,7 @@ echo 32 > /proc/progress
 
 # set UDMA66
 hdparm -X66 /dev/hda1
+hdparm -d1 /dev/hda1
 
 echo 34 > /proc/progress
 
old mode 100755 (executable)
new mode 100644 (file)
index 4371c00..725a355
@@ -5,7 +5,7 @@ PRIORITY = "required"
 PROVIDES = "initscripts"
 RPROVIDES_${PN} = "initscripts"
 LICENSE = "GPL"
-PR = "r27"
+PR = "r29"
 
 FILESPATHPKG = "initscripts-${PV}:initscripts:files"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
index 52eb996..d761de0 100755 (executable)
@@ -4,12 +4,12 @@ LICENSE = "GPL"
 DEPENDS = "libdvdnav"
 RDEPENDS = "libdvdnav"
 
-SRCREV=""
-SRCDATE="20101124"
+SRCREV="9e5a6721fb28a518300d311e06b7a30dfff2080f"
+SRCDATE="20110129"
 BRANCH="${@base_contains('MACHINE', 'dm7025', '7025', 'master', d)}"
 
 PR = "r0"
-PV = "0.9+git${SRCDATE}"
+PV = "0.10+git${SRCDATE}"
 
 SRC_URI="git://schwerkraft.elitedvb.net/libdreamdvd/libdreamdvd.git;protocol=git;branch=${BRANCH};tag=${SRCREV}"
 
diff --git a/recipes/libebml/libebml_0.7.8.bb b/recipes/libebml/libebml_0.7.8.bb
deleted file mode 100644 (file)
index 2e7978b..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "Extensible binary format library (kinda like XML)"
-HOMEPAGE = "http://www.matroska.org/"
-SECTION = "libs"
-PRIORITY = "optional"
-
-LICENSE="LGPL-2.1"
-
-inherit pkgconfig
-
-SRC_URI = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${PN}-${PV}.tar.bz2"
-
-#S="${S}/make/linux"
-
-do_compile() {
-       cd ${S}/make/linux
-       oe_runmake CC="${CC}" CXX="${CXX}" AR="${AR} rcvu"
-}
-
-do_stage () {
-       oe_libinstall -a -so -C make/linux libebml ${STAGING_LIBDIR}
-}
-
-do_install() {
-       install -m 0644 ebml/*.h ${STAGING_INCDIR}
-       install -d ${STAGING_INCDIR}/ebml
-       (cd ${S}/ebml; cp *.h ${STAGING_INCDIR}/ebml/; mkdir -p ${STAGING_INCDIR}/ebml/c; cp c/libebml_t.h ${STAGING_INCDIR}/ebml/c;)
-}
diff --git a/recipes/libmatroska/Makefile b/recipes/libmatroska/Makefile
deleted file mode 100644 (file)
index c5f5e66..0000000
+++ /dev/null
@@ -1,176 +0,0 @@
-# libmatroska core Makefile (used in cygwin)
-# $Id: Makefile 1254 2006-06-02 14:32:52Z mosu $
-# Author: Steve Lhomme <robux4 @ users.sf.net>
-# Author: Moritz Bunkus <moritz @ bunkus.org>
-
-#
-# The library is built without debug information. If you want
-# debug information to be included then compile with
-# 'make DEBUG=yes'.
-#
-
-# Paths
-libdir=$(LIBDIR)
-includedir=$(INCDIR)/matroska
-
-# Programs
-CXX=g++
-LD=$(CXX)
-AR = ar rcvu
-RANLIB = ranlib
-INSTALL = install
-INSTALL_OPTS = -m 644
-INSTALL_OPTS_LIB = -m 644
-INSTALL_DIR_OPTS = -m 755
-
-ifneq (,$(shell $(CXX) -v 2>&1 | tail -n 1 | grep -i mingw))
-$(error Please use the Makefile in ../mingw32)
-endif
-
-CWD=$(shell pwd)
-
-# Options
-LIBEBML_INCLUDE_DIR=$(INCDIR)/ebml
-LIBEBML_LIB_DIR=$(LIBDIR)
-EXTENSION=.cpp
-
-
-ifeq (yes,$(DEBUG))
-DEBUGFLAGS=-g -DDEBUG
-endif
-
-SRC_DIR=$(CWD)/src/
-INCLUDE_DIR=$(CWD)/matroska
-MUX_SRC_DIR=$(CWD)/test/mux/
-TAG_SRC_DIR=$(CWD)/test/tags/
-
-# Librarires
-INCLUDE=-I$(CWD)/. -I$(LIBEBML_INCLUDE_DIR)
-LIBS=
-MUX_LIBS=-lmatroska -lebml $(LIBICONV)
-
-# Names
-LIBRARY=libmatroska.a
-LIBRARY_SO=libmatroska.so
-LIBRARY_SO_VER=libmatroska.so.0
-
-# source-files
-sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
-
-# header files; replace .cxx extension with .h
-headers:=$(patsubst %$(EXTENSION),%.h,$(sources))
-
-# object files; replace .cxx extension with .o
-objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
-
-objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))
-
-WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \
-               -Wshadow
-COMPILEFLAGS=$(DEBUGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(WARNINGFLAGS) $(INCLUDE)
-LINKFLAGS=-L. -L$(LIBEBML_LIB_DIR) $(LDFLAGS)
-DEPENDFLAGS  = $(CXXFLAGS) $(INCLUDE)
-
-ifeq (Darwin,$(shell uname -s))
-all: staticlib
-else
-all: staticlib sharedlib
-endif
-
-staticlib: $(LIBRARY)
-
-sharedlib: $(LIBRARY_SO)
-
-lib:
-       @echo "Use the 'staticlib', 'sharedlib' or 'all' targets."
-       @false
-
-# Build rules
-%.o: %$(EXTENSION)
-       $(CXX) -c $(COMPILEFLAGS) -o $@ $<
-
-%.lo: %$(EXTENSION)
-       $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
-
-$(LIBRARY): $(objects)
-       $(AR) $@ $(objects)
-       $(RANLIB) $@
-
-$(LIBRARY_SO): $(objects_so)
-       $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -L$(LIBEBML_LIB_DIR) -lebml
-       rm -f $(LIBRARY_SO)
-       ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
-
-clean: cleantest
-       rm -f $(objects) $(objects_so)
-       rm -f $(LIBRARY)
-       rm -f $(LIBRARY_SO)
-       rm -f $(LIBRARY_SO_VER)
-       rm -f CORE
-
-cleantest:
-       rm -f test6 test8 test9 test6.o test8.o test9.o
-
-distclean dist-clean: clean
-       rm -f .depend
-
-depend:
-       @echo Calculating dependecies:
-       @rm -f .depend
-       @touch .depend
-       @for i in $(sources); do \
-               o="`echo $$i | sed -e 's/\.c$$/.o/' -e 's/\.cpp$$/.o/'`" ; \
-               echo '  ' $$i: $$o ; \
-               $(CXX) $(DEPENDFLAGS) -MM -MT $$o $$i >> .depend ; \
-       done
-
-test: test6 test9
-
-test6: test6.o $(LIBRARY) $(LIBRARY_SO)
-       $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
-
-test6.o: $(MUX_SRC_DIR)test6.cpp
-       $(CXX) -c $(COMPILEFLAGS) -o $@ $<
-
-test8: test8.o $(LIBRARY) $(LIBRARY_SO)
-       $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
-
-test8.o: $(MUX_SRC_DIR)test8.cpp
-       $(CXX) -c $(COMPILEFLAGS) -o $@ $<
-
-test9: test9.o $(LIBRARY) $(LIBRARY_SO)
-       $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
-
-test9.o: $(TAG_SRC_DIR)test9.cpp
-       $(CXX) -c $(COMPILEFLAGS) -o $@ $<
-
-ifeq (Darwin,$(shell uname -s))
-install: install_staticlib install_headers
-else
-install: install_staticlib install_sharedlib install_headers
-endif
-
-install_headers:
-       $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
-       for i in $(INCLUDE_DIR)/*.h; do \
-               $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \
-       done
-       $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c
-       for i in $(INCLUDE_DIR)/c/*.h; do \
-               $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \
-       done
-
-install_staticlib: $(LIBRARY)
-       $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
-       $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
-
-install_sharedlib: $(LIBRARY_SO)
-       $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
-       $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
-       ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
-
-ifneq ($(wildcard .depend),)
-include .depend
-endif
-
-# DO NOT DELETE
diff --git a/recipes/libmatroska/libmatroska_0.8.1.bb b/recipes/libmatroska/libmatroska_0.8.1.bb
deleted file mode 100644 (file)
index c976cd2..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-DESCRIPTION = "Extensible multimedia container format based on EBML"
-HOMEPAGE = "http://www.matroska.org/"
-SECTION = "libs"
-PRIORITY = "optional"
-MAINTAINER = "Andreas Frisch <andreas.frisch@multimedia-labs.de>"
-
-LICENSE = "GPL-2"
-
-DEPENDS = "libebml"
-
-inherit pkgconfig autotools module-base
-
-PR = "r0"
-
-#EXTRA_OEMAKE += "CFLAGS='${CFLAGS} -I${STAGING_INCDIR}' LDFLAGS='${LDFLAGS} -L${STAGING_LIBDIR}"
-#LDFLAGS += " -L${STAGING_LIBDIR}"
-#EXTRA_OEMAKE += " LDFLAGS='${LDFLAGS}"
-
-EXTRA_OECONF = " --enable-shared "
-
-SRC_URI = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${PN}-${PV}.tar.bz2\
-           file://Makefile"
-
-do_compile() {
-       cp ${WORKDIR}/Makefile ${WORKDIR}/${PN}-${PV}
-       oe_runmake CC="${CC}" CXX="${CXX}" AR="${AR} rcvu" INCDIR="${STAGING_INCDIR}" LIBDIR="${STAGING_LIBDIR}"
-}
-
-do_stage() {
-       oe_libinstall -a -so -C ./ libmatroska ${STAGING_LIBDIR}
-#      cd make/linux
-#      oe_libinstall -so  ${STAGING_LIBDIR}
-}
-
-do_install() {
-       oe_runmake install_headers CC="${CC}" CXX="${CXX}" AR="${AR} rcvu" INCDIR="${STAGING_INCDIR}" LIBDIR="${STAGING_LIBDIR}"
-}
index 7ced16d..90c2597 100644 (file)
@@ -708,7 +708,7 @@ CONFIG_NETIF_DMA=y
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
+CONFIG_TUN=m
 
 #
 # ARCnet devices
@@ -1531,8 +1531,8 @@ CONFIG_MSDOS_PARTITION=y
 # Native Language Support
 #
 CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="iso8859-15"
-CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_CODEPAGE_737=m
 CONFIG_NLS_CODEPAGE_775=m
 CONFIG_NLS_CODEPAGE_850=m
@@ -1556,7 +1556,7 @@ CONFIG_NLS_ISO8859_8=m
 CONFIG_NLS_CODEPAGE_1250=m
 CONFIG_NLS_CODEPAGE_1251=m
 CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_ISO8859_2=m
 CONFIG_NLS_ISO8859_3=m
 CONFIG_NLS_ISO8859_4=m
index 4c96b10..1507ff3 100644 (file)
@@ -711,7 +711,7 @@ CONFIG_NETIF_DMA=y
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
+CONFIG_TUN=m
 
 #
 # ARCnet devices
@@ -1535,8 +1535,8 @@ CONFIG_MSDOS_PARTITION=y
 # Native Language Support
 #
 CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="iso8859-15"
-CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_CODEPAGE_737=m
 CONFIG_NLS_CODEPAGE_775=m
 CONFIG_NLS_CODEPAGE_850=m
@@ -1560,7 +1560,7 @@ CONFIG_NLS_ISO8859_8=m
 CONFIG_NLS_CODEPAGE_1250=m
 CONFIG_NLS_CODEPAGE_1251=m
 CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_ISO8859_2=m
 CONFIG_NLS_ISO8859_3=m
 CONFIG_NLS_ISO8859_4=m
index fd94147..63d5cf2 100644 (file)
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 PN = "linux-dm7025"
 KV = "2.6.12"
 PV = "2.6.12.6"
-PR = "s9"
+PR = "s11"
 
 DEPENDS = "zlib-native zlib"
 
@@ -25,7 +25,7 @@ SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
 #squashfs-lzma stuff
        http://squashfs-lzma.org/dl/sqlzma3.2-r2b.tar.bz2 \
        http://dreamboxupdate.com/download/kernel-patches/sqlzma2k-3.2-r2-2.6.12.6.patch.bz2 \
-       http://dreamboxupdate.com/download/patches/fix_lzma_squashfs_makefiles_for_oe-r2.patch.bz2 \
+       http://dreamboxupdate.com/download/patches/fix_lzma_squashfs_makefiles_for_oe-r3.patch.bz2 \
        ${SOURCEFORGE_MIRROR}/squashfs/squashfs3.2-r2.tar.gz \
        ${SOURCEFORGE_MIRROR}/sevenzip/lzma443.tar.bz2 \
        file://${WORKDIR}/squashfs-lzma/kernel-patches/linux-2.6.12/squashfs3.2-patch;pnum=1;patch=1 \
@@ -49,8 +49,7 @@ do_munge () {
        if [ -d ${WORKDIR}/squashfs3.2-r2 ]; then
                mv ${WORKDIR}/squashfs3.2-r2/* ${WORKDIR}
                rm -R ${WORKDIR}/squashfs3.2-r2
-               for i in sqlzma1-443.patch sqlzma2u-3.2-r2.patch fix_lzma_squashfs_makefiles_for_oe-r2.patch; 
-               do
+               for i in sqlzma1-443.patch sqlzma2u-3.2-r2.patch fix_lzma_squashfs_makefiles_for_oe-r3.patch; do
                        echo "Applying $i"
                        patch -d ${WORKDIR} -p1 < ${WORKDIR}/$i
                done
index fa7a88c..bc7f2ec 100644 (file)
@@ -1492,7 +1492,7 @@ CONFIG_MSDOS_PARTITION=y
 # Native Language Support
 #
 CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_CODEPAGE_737=m
 CONFIG_NLS_CODEPAGE_775=m
index 096a4c5..937c94b 100644 (file)
@@ -698,7 +698,7 @@ CONFIG_NETIF_DMA=y
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
+CONFIG_TUN=m
 
 #
 # ARCnet devices
@@ -1517,8 +1517,8 @@ CONFIG_MSDOS_PARTITION=y
 # Native Language Support
 #
 CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="iso8859-15"
-CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_CODEPAGE_737=m
 CONFIG_NLS_CODEPAGE_775=m
 CONFIG_NLS_CODEPAGE_850=m
@@ -1542,7 +1542,7 @@ CONFIG_NLS_ISO8859_8=m
 CONFIG_NLS_CODEPAGE_1250=m
 CONFIG_NLS_CODEPAGE_1251=m
 CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_ISO8859_2=m
 CONFIG_NLS_ISO8859_3=m
 CONFIG_NLS_ISO8859_4=m
index ccfca47..b51cf49 100644 (file)
@@ -710,7 +710,7 @@ CONFIG_NETIF_DMA=y
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
+CONFIG_TUN=m
 
 #
 # ARCnet devices
@@ -1530,8 +1530,8 @@ CONFIG_MSDOS_PARTITION=y
 # Native Language Support
 #
 CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="iso8859-15"
-CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_CODEPAGE_737=m
 CONFIG_NLS_CODEPAGE_775=m
 CONFIG_NLS_CODEPAGE_850=m
@@ -1555,7 +1555,7 @@ CONFIG_NLS_ISO8859_8=m
 CONFIG_NLS_CODEPAGE_1250=m
 CONFIG_NLS_CODEPAGE_1251=m
 CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_ISO8859_2=m
 CONFIG_NLS_ISO8859_3=m
 CONFIG_NLS_ISO8859_4=m
diff --git a/recipes/linux/linux-dm8000-2.6.18/linux-2.6.18-dm8000-nand-smp-fix.patch b/recipes/linux/linux-dm8000-2.6.18/linux-2.6.18-dm8000-nand-smp-fix.patch
new file mode 100644 (file)
index 0000000..801e6d6
--- /dev/null
@@ -0,0 +1,42 @@
+--- linux-2.6.18-org/drivers/mtd/nand/dm8000_nand.c    2010-10-18 22:40:58.000000000 +0200
++++ linux-2.6.18/drivers/mtd/nand/dm8000_nand.c        2011-02-09 19:23:15.808489533 +0100
+@@ -16,6 +16,7 @@
+  *
+  */
++#include <linux/delay.h>
+ #include <linux/jiffies.h>
+ #include <linux/slab.h>
+ #include <linux/module.h>
+@@ -61,16 +62,24 @@
+ };
+ #define NUM_PARTITIONS 7
++static int dm8000_nand_dev_ready(struct mtd_info *mtd);
++
+ static void dm8000_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
+ {
+-      if (ctrl & NAND_CTRL_CHANGE) {
+-              if (!(ctrl & NAND_NCE))
+-                      writeb(0, (void __iomem *)0xBF030003);
+-              //else
+-              //      readb((void __iomem *)0xBF030002);
+-      }
+-      if (cmd == NAND_CMD_NONE)
++      if (ctrl & NAND_CTRL_CHANGE && !(ctrl & NAND_NCE))
++              writeb(0, (void __iomem *)0xBF030003);
++
++      if (cmd == NAND_CMD_NONE) {
++#ifdef CONFIG_SMP
++              struct nand_chip *this = (struct nand_chip *)(dm8000_mtd+1);
++              int cnt=0;
++              while (cnt < this->chip_delay && !dm8000_nand_dev_ready(mtd)) {
++                      ++cnt;
++                      udelay(1);
++              }
++#endif
+               return;
++      }
+       if (ctrl & NAND_CLE)
+               writeb(cmd, (void __iomem *)0xBF030000);
index f86030e..2428b6d 100644 (file)
@@ -1,7 +1,8 @@
 require linux-opendreambox-2.6.18.inc
 
-PR="${PR_INC}.0"
+PR="${PR_INC}.1"
 
 SRC_URI += "\
        file://linux-2.6.18-disable-unneeded-uarts.patch;patch=1 \
+       file://linux-2.6.18-dm8000-nand-smp-fix.patch;patch=1 \
 "
index 27f7220..bc94cc9 100644 (file)
@@ -708,7 +708,7 @@ CONFIG_NETIF_DMA=y
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
+CONFIG_TUN=m
 
 #
 # ARCnet devices
@@ -1531,8 +1531,8 @@ CONFIG_MSDOS_PARTITION=y
 # Native Language Support
 #
 CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="iso8859-15"
-CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_CODEPAGE_737=m
 CONFIG_NLS_CODEPAGE_775=m
 CONFIG_NLS_CODEPAGE_850=m
@@ -1556,7 +1556,7 @@ CONFIG_NLS_ISO8859_8=m
 CONFIG_NLS_CODEPAGE_1250=m
 CONFIG_NLS_CODEPAGE_1251=m
 CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_ISO8859_2=m
 CONFIG_NLS_ISO8859_3=m
 CONFIG_NLS_ISO8859_4=m
index 2502c7e..e45b4f0 100644 (file)
@@ -1,7 +1,7 @@
 require linux-opendreambox.inc
 
 SRCREV = "c59d7210272be29e3850aca3abbff76443f65d6f-fixed"
-PR_INC = "r7"
+PR_INC = "r10"
 
 RREPLACES_kernel = "kernel-2.6.18-7.1-${MACHINE}"
 RCONFLICTS_kernel = "kernel-2.6.18-7.1-${MACHINE}"
diff --git a/recipes/matroska/libebml.inc b/recipes/matroska/libebml.inc
new file mode 100644 (file)
index 0000000..8472a11
--- /dev/null
@@ -0,0 +1,3 @@
+DESCRIPTION = "access library for the EBML format"
+
+require matroska.inc
diff --git a/recipes/matroska/libebml_1.0.0.bb b/recipes/matroska/libebml_1.0.0.bb
new file mode 100644 (file)
index 0000000..bd54419
--- /dev/null
@@ -0,0 +1 @@
+require ${PN}.inc
diff --git a/recipes/matroska/libmatroska.inc b/recipes/matroska/libmatroska.inc
new file mode 100644 (file)
index 0000000..4f1e2cc
--- /dev/null
@@ -0,0 +1,4 @@
+DESCRIPTION = "extensible open standard audio/video container format"
+DEPENDS = "libebml"
+
+require matroska.inc
diff --git a/recipes/matroska/libmatroska_1.0.0.bb b/recipes/matroska/libmatroska_1.0.0.bb
new file mode 100644 (file)
index 0000000..bd54419
--- /dev/null
@@ -0,0 +1 @@
+require ${PN}.inc
diff --git a/recipes/matroska/matroska.inc b/recipes/matroska/matroska.inc
new file mode 100644 (file)
index 0000000..5ce8fa5
--- /dev/null
@@ -0,0 +1,16 @@
+HOMEPAGE = "http://www.matroska.org/"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "LGPLv2.1"
+
+SRC_URI = "http://dl.matroska.org/downloads/${PN}/${P}.tar.bz2"
+
+EXTRA_OEMAKE = "CROSS=${TARGET_PREFIX} prefix=${D}${prefix} -C make/linux"
+
+do_compile() {
+        oe_runmake
+}
+
+do_install() {
+        oe_runmake install
+}
index 65b1425..0df0432 100644 (file)
@@ -9,7 +9,7 @@ Index: mc-4.6.2/src/Makefile.am
 -man2hlp_LDADD = $(GLIB_LIBS)
 +man2hlp$(EXEEXT): $(man2hlp_OBJECTS) $(man2hlp_DEPENDENCIES)
 +      @rm -f man2hlp$(EXEEXT)
-+      $(CC_FOR_BUILD) $(DEFAULT_INCLUDES) $(CFLAGS_FOR_BUILD) $(GLIB_CFLAGS_FOR_BUILD) -I$(top_srcdir) $(GLIB_LIBS_FOR_BUILD) $(man2hlp_SOURCES) -o $@
++      $(CC_FOR_BUILD) $(DEFAULT_INCLUDES) $(CFLAGS_FOR_BUILD) $(GLIB_CFLAGS_FOR_BUILD) -I$(top_srcdir) $(man2hlp_SOURCES) $(GLIB_LIBS_FOR_BUILD) -o $@
  
  mcmfmt_SOURCES = mfmt.c
  
index c40aa2e..00ac6e4 100644 (file)
@@ -1,5 +1,5 @@
 require mc.inc
-PR = "r5"
+PR = "r6"
 HOMEPAGE = "http://www.midnight-commander.org/"
 
 S = "${WORKDIR}/${PN}-${PV}"
index c344203..9eb1908 100644 (file)
@@ -1,12 +1,10 @@
 --- minicom-2.3/src/minicom.c-orig     2009-06-08 14:49:07.000000000 +0200
 +++ minicom-2.3/src/minicom.c  2009-06-08 14:50:23.000000000 +0200
-@@ -63,6 +63,10 @@
+@@ -63,6 +63,8 @@
  }
  #endif /*DEBUG*/
  
-+#ifdef __USE_GNU
 +#define getline minicom_getline
-+#endif
 +
  /*
   * Sub - menu's.
index 736ac84..baa02a6 100644 (file)
@@ -1,6 +1,7 @@
 SECTION = "console/network"
 DEPENDS = "ncurses"
 LICENSE = "GPL"
+PR = "r1"
 SRC_URI = "http://alioth.debian.org/frs/download.php/2332/minicom-${PV}.tar.gz \
        file://rename-conflicting-functions.patch;patch=1 \
        "
diff --git a/recipes/openssl/openssl-0.9.8j/openssl-x86_64-bintuils-2.20.51.patch b/recipes/openssl/openssl-0.9.8j/openssl-x86_64-bintuils-2.20.51.patch
new file mode 100644 (file)
index 0000000..88340ac
--- /dev/null
@@ -0,0 +1,142 @@
+diff -Naur openssl-0.9.8l-orig/crypto/md5/asm/md5-x86_64.pl openssl-0.9.8l/crypto/md5/asm/md5-x86_64.pl
+--- openssl-0.9.8l-orig/crypto/md5/asm/md5-x86_64.pl   2007-11-11 07:34:06.000000000 -0600
++++ openssl-0.9.8l/crypto/md5/asm/md5-x86_64.pl        2009-11-16 14:34:32.000000000 -0600
+@@ -146,73 +146,73 @@
+       mov     %ecx,           %r14d
+       mov     %edx,           %r15d
+ EOF
+-round1_step(-1,'%eax','%ebx','%ecx','%edx', '1','0xd76aa478', '7');
+-round1_step( 0,'%edx','%eax','%ebx','%ecx', '2','0xe8c7b756','12');
++round1_step(-1,'%eax','%ebx','%ecx','%edx', '1','-0x28955B88', '7');
++round1_step( 0,'%edx','%eax','%ebx','%ecx', '2','-0x173848AA','12');
+ round1_step( 0,'%ecx','%edx','%eax','%ebx', '3','0x242070db','17');
+-round1_step( 0,'%ebx','%ecx','%edx','%eax', '4','0xc1bdceee','22');
+-round1_step( 0,'%eax','%ebx','%ecx','%edx', '5','0xf57c0faf', '7');
++round1_step( 0,'%ebx','%ecx','%edx','%eax', '4','-0x3E423112','22');
++round1_step( 0,'%eax','%ebx','%ecx','%edx', '5','-0x0A83F051', '7');
+ round1_step( 0,'%edx','%eax','%ebx','%ecx', '6','0x4787c62a','12');
+-round1_step( 0,'%ecx','%edx','%eax','%ebx', '7','0xa8304613','17');
+-round1_step( 0,'%ebx','%ecx','%edx','%eax', '8','0xfd469501','22');
++round1_step( 0,'%ecx','%edx','%eax','%ebx', '7','-0x57CFB9ED','17');
++round1_step( 0,'%ebx','%ecx','%edx','%eax', '8','-0x02B96AFF','22');
+ round1_step( 0,'%eax','%ebx','%ecx','%edx', '9','0x698098d8', '7');
+-round1_step( 0,'%edx','%eax','%ebx','%ecx','10','0x8b44f7af','12');
+-round1_step( 0,'%ecx','%edx','%eax','%ebx','11','0xffff5bb1','17');
+-round1_step( 0,'%ebx','%ecx','%edx','%eax','12','0x895cd7be','22');
++round1_step( 0,'%edx','%eax','%ebx','%ecx','10','-0x74BB0851','12');
++round1_step( 0,'%ecx','%edx','%eax','%ebx','11','-0x0000A44F','17');
++round1_step( 0,'%ebx','%ecx','%edx','%eax','12','-0x76A32842','22');
+ round1_step( 0,'%eax','%ebx','%ecx','%edx','13','0x6b901122', '7');
+-round1_step( 0,'%edx','%eax','%ebx','%ecx','14','0xfd987193','12');
+-round1_step( 0,'%ecx','%edx','%eax','%ebx','15','0xa679438e','17');
++round1_step( 0,'%edx','%eax','%ebx','%ecx','14','-0x02678E6D','12');
++round1_step( 0,'%ecx','%edx','%eax','%ebx','15','-0x5986BC72','17');
+ round1_step( 1,'%ebx','%ecx','%edx','%eax', '0','0x49b40821','22');
+-round2_step(-1,'%eax','%ebx','%ecx','%edx', '6','0xf61e2562', '5');
+-round2_step( 0,'%edx','%eax','%ebx','%ecx','11','0xc040b340', '9');
++round2_step(-1,'%eax','%ebx','%ecx','%edx', '6','-0x09E1DA9E', '5');
++round2_step( 0,'%edx','%eax','%ebx','%ecx','11','-0x3FBF4CC0', '9');
+ round2_step( 0,'%ecx','%edx','%eax','%ebx', '0','0x265e5a51','14');
+-round2_step( 0,'%ebx','%ecx','%edx','%eax', '5','0xe9b6c7aa','20');
+-round2_step( 0,'%eax','%ebx','%ecx','%edx','10','0xd62f105d', '5');
++round2_step( 0,'%ebx','%ecx','%edx','%eax', '5','-0x16493856','20');
++round2_step( 0,'%eax','%ebx','%ecx','%edx','10','-0x29D0EFA3', '5');
+ round2_step( 0,'%edx','%eax','%ebx','%ecx','15', '0x2441453', '9');
+-round2_step( 0,'%ecx','%edx','%eax','%ebx', '4','0xd8a1e681','14');
+-round2_step( 0,'%ebx','%ecx','%edx','%eax', '9','0xe7d3fbc8','20');
++round2_step( 0,'%ecx','%edx','%eax','%ebx', '4','-0x275E197F','14');
++round2_step( 0,'%ebx','%ecx','%edx','%eax', '9','-0x182C0438','20');
+ round2_step( 0,'%eax','%ebx','%ecx','%edx','14','0x21e1cde6', '5');
+-round2_step( 0,'%edx','%eax','%ebx','%ecx', '3','0xc33707d6', '9');
+-round2_step( 0,'%ecx','%edx','%eax','%ebx', '8','0xf4d50d87','14');
++round2_step( 0,'%edx','%eax','%ebx','%ecx', '3','-0x3CC8F82A', '9');
++round2_step( 0,'%ecx','%edx','%eax','%ebx', '8','-0x0B2AF279','14');
+ round2_step( 0,'%ebx','%ecx','%edx','%eax','13','0x455a14ed','20');
+-round2_step( 0,'%eax','%ebx','%ecx','%edx', '2','0xa9e3e905', '5');
+-round2_step( 0,'%edx','%eax','%ebx','%ecx', '7','0xfcefa3f8', '9');
++round2_step( 0,'%eax','%ebx','%ecx','%edx', '2','-0x561C16FB', '5');
++round2_step( 0,'%edx','%eax','%ebx','%ecx', '7','-0x03105C08', '9');
+ round2_step( 0,'%ecx','%edx','%eax','%ebx','12','0x676f02d9','14');
+-round2_step( 1,'%ebx','%ecx','%edx','%eax', '0','0x8d2a4c8a','20');
++round2_step( 1,'%ebx','%ecx','%edx','%eax', '0','-0x72D5B376','20');
+-round3_step(-1,'%eax','%ebx','%ecx','%edx', '8','0xfffa3942', '4');
+-round3_step( 0,'%edx','%eax','%ebx','%ecx','11','0x8771f681','11');
++round3_step(-1,'%eax','%ebx','%ecx','%edx', '8','-0x0005C6BE', '4');
++round3_step( 0,'%edx','%eax','%ebx','%ecx','11','-0x788E097F','11');
+ round3_step( 0,'%ecx','%edx','%eax','%ebx','14','0x6d9d6122','16');
+-round3_step( 0,'%ebx','%ecx','%edx','%eax', '1','0xfde5380c','23');
+-round3_step( 0,'%eax','%ebx','%ecx','%edx', '4','0xa4beea44', '4');
++round3_step( 0,'%ebx','%ecx','%edx','%eax', '1','-0x021AC7F4','23');
++round3_step( 0,'%eax','%ebx','%ecx','%edx', '4','-0x5B4115BC', '4');
+ round3_step( 0,'%edx','%eax','%ebx','%ecx', '7','0x4bdecfa9','11');
+-round3_step( 0,'%ecx','%edx','%eax','%ebx','10','0xf6bb4b60','16');
+-round3_step( 0,'%ebx','%ecx','%edx','%eax','13','0xbebfbc70','23');
++round3_step( 0,'%ecx','%edx','%eax','%ebx','10','-0x0944B4A0','16');
++round3_step( 0,'%ebx','%ecx','%edx','%eax','13','-0x41404390','23');
+ round3_step( 0,'%eax','%ebx','%ecx','%edx', '0','0x289b7ec6', '4');
+-round3_step( 0,'%edx','%eax','%ebx','%ecx', '3','0xeaa127fa','11');
+-round3_step( 0,'%ecx','%edx','%eax','%ebx', '6','0xd4ef3085','16');
++round3_step( 0,'%edx','%eax','%ebx','%ecx', '3','-0x155ED806','11');
++round3_step( 0,'%ecx','%edx','%eax','%ebx', '6','-0x2B10CF7B','16');
+ round3_step( 0,'%ebx','%ecx','%edx','%eax', '9', '0x4881d05','23');
+-round3_step( 0,'%eax','%ebx','%ecx','%edx','12','0xd9d4d039', '4');
+-round3_step( 0,'%edx','%eax','%ebx','%ecx','15','0xe6db99e5','11');
++round3_step( 0,'%eax','%ebx','%ecx','%edx','12','-0x262B2FC7', '4');
++round3_step( 0,'%edx','%eax','%ebx','%ecx','15','-0x1924661B','11');
+ round3_step( 0,'%ecx','%edx','%eax','%ebx', '2','0x1fa27cf8','16');
+-round3_step( 1,'%ebx','%ecx','%edx','%eax', '0','0xc4ac5665','23');
++round3_step( 1,'%ebx','%ecx','%edx','%eax', '0','-0x3B53A99B','23');
+-round4_step(-1,'%eax','%ebx','%ecx','%edx', '7','0xf4292244', '6');
++round4_step(-1,'%eax','%ebx','%ecx','%edx', '7','-0x0BD6DDBC', '6');
+ round4_step( 0,'%edx','%eax','%ebx','%ecx','14','0x432aff97','10');
+-round4_step( 0,'%ecx','%edx','%eax','%ebx', '5','0xab9423a7','15');
+-round4_step( 0,'%ebx','%ecx','%edx','%eax','12','0xfc93a039','21');
++round4_step( 0,'%ecx','%edx','%eax','%ebx', '5','-0x546BDC59','15');
++round4_step( 0,'%ebx','%ecx','%edx','%eax','12','-0x036C5FC7','21');
+ round4_step( 0,'%eax','%ebx','%ecx','%edx', '3','0x655b59c3', '6');
+-round4_step( 0,'%edx','%eax','%ebx','%ecx','10','0x8f0ccc92','10');
+-round4_step( 0,'%ecx','%edx','%eax','%ebx', '1','0xffeff47d','15');
+-round4_step( 0,'%ebx','%ecx','%edx','%eax', '8','0x85845dd1','21');
++round4_step( 0,'%edx','%eax','%ebx','%ecx','10','-0x70F3336E','10');
++round4_step( 0,'%ecx','%edx','%eax','%ebx', '1','-0x00100B83','15');
++round4_step( 0,'%ebx','%ecx','%edx','%eax', '8','-0x7A7BA22F','21');
+ round4_step( 0,'%eax','%ebx','%ecx','%edx','15','0x6fa87e4f', '6');
+-round4_step( 0,'%edx','%eax','%ebx','%ecx', '6','0xfe2ce6e0','10');
+-round4_step( 0,'%ecx','%edx','%eax','%ebx','13','0xa3014314','15');
++round4_step( 0,'%edx','%eax','%ebx','%ecx', '6','-0x01D31920','10');
++round4_step( 0,'%ecx','%edx','%eax','%ebx','13','-0x5CFEBCEC','15');
+ round4_step( 0,'%ebx','%ecx','%edx','%eax', '4','0x4e0811a1','21');
+-round4_step( 0,'%eax','%ebx','%ecx','%edx','11','0xf7537e82', '6');
+-round4_step( 0,'%edx','%eax','%ebx','%ecx', '2','0xbd3af235','10');
++round4_step( 0,'%eax','%ebx','%ecx','%edx','11','-0x08AC817E', '6');
++round4_step( 0,'%edx','%eax','%ebx','%ecx', '2','-0x42C50DCB','10');
+ round4_step( 0,'%ecx','%edx','%eax','%ebx', '9','0x2ad7d2bb','15');
+-round4_step( 1,'%ebx','%ecx','%edx','%eax', '0','0xeb86d391','21');
++round4_step( 1,'%ebx','%ecx','%edx','%eax', '0','-0x14792C6F','21');
+ $code .= <<EOF;
+       # add old values of A, B, C, D
+       add     %r8d,   %eax
+diff -Naur openssl-0.9.8l-orig/crypto/sha/asm/sha1-x86_64.pl openssl-0.9.8l/crypto/sha/asm/sha1-x86_64.pl
+--- openssl-0.9.8l-orig/crypto/sha/asm/sha1-x86_64.pl  2007-11-11 07:56:47.000000000 -0600
++++ openssl-0.9.8l/crypto/sha/asm/sha1-x86_64.pl       2009-11-16 14:35:51.000000000 -0600
+@@ -143,7 +143,7 @@
+ sub BODY_20_39 {
+ my ($i,$a,$b,$c,$d,$e,$f)=@_;
+ my $j=$i+1;
+-my $K=($i<40)?0x6ed9eba1:0xca62c1d6;
++my $K=($i<40)?0x6ed9eba1:-0x359D3E2A;
+ $code.=<<___ if ($i<79);
+       lea     $K($xi,$e),$f
+       mov     `4*($j%16)`(%rsp),$xi
+@@ -180,7 +180,7 @@
+ my ($i,$a,$b,$c,$d,$e,$f)=@_;
+ my $j=$i+1;
+ $code.=<<___;
+-      lea     0x8f1bbcdc($xi,$e),$f
++      lea     -0x70E44324($xi,$e),$f
+       mov     `4*($j%16)`(%rsp),$xi
+       mov     $b,$t0
+       mov     $b,$t1
index eba3ba9..95548c6 100644 (file)
@@ -2,7 +2,7 @@ inherit pkgconfig native
 
 require openssl.inc
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 # This flag can contain target options (e.g -mfpu=neon for armv7-a systems)
 export FULL_OPTIMIZATION = " "
@@ -10,6 +10,7 @@ export BUILD_OPTIMIZATION = " "
 
 SRC_URI += "file://configure-targets.patch;patch=1 \
             file://shared-libs.patch;patch=1 \
+            file://openssl-x86_64-bintuils-2.20.51.patch;patch=1 \
             file://debian.patch;patch=1"
 
 PARALLEL_MAKE = ""
diff --git a/recipes/opkg/files/r599-fix-depmod.patch b/recipes/opkg/files/r599-fix-depmod.patch
new file mode 100644 (file)
index 0000000..b461a7f
--- /dev/null
@@ -0,0 +1,32 @@
+commit 6d27d9bb440be0006a754c7473e72f6e1dbdad04
+Author: graham.gower@gmail.com <graham.gower@gmail.com@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>
+Date:   Wed Feb 2 00:53:46 2011 +0000
+
+    Fix depmod intercept. Patch from Andreas Oberritter.
+    
+    * If depmod -a ${KERNEL_VERSION} is called, the version should be retained.
+    * The script calls depmod -A, which does nothing if the installed module's
+      timestamp is older than modules.dep's timestamp. As modules generally
+      inherit the timestamp of the build, this would result in depmod doing nothing.
+    
+    git-svn-id: http://opkg.googlecode.com/svn/trunk@599 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358
+
+diff --git a/intercept/depmod b/intercept/depmod
+index a60768f..f8a4f9a 100644
+--- a/intercept/depmod
++++ b/intercept/depmod
+@@ -1,10 +1,10 @@
+ #!/bin/sh
+ if [ "x$1" = "x-a" ] || [ "x$1" = "x-A" ]; then
+-  if [ ! -f $OPKG_INTERCEPT_DIR/depmod ]; then
+-    echo "depmod -A" > $OPKG_INTERCEPT_DIR/depmod
+-    chmod +x $OPKG_INTERCEPT_DIR/depmod
+-  fi
++  echo "depmod $@" >> $OPKG_INTERCEPT_DIR/depmod
++  sort -u $OPKG_INTERCEPT_DIR/depmod > $OPKG_INTERCEPT_DIR/depmod.tmp
++  mv $OPKG_INTERCEPT_DIR/depmod.tmp $OPKG_INTERCEPT_DIR/depmod
++  chmod +x $OPKG_INTERCEPT_DIR/depmod
+   exit 0
+ fi
index f366e3d..c7d59be 100755 (executable)
@@ -3,7 +3,7 @@ require opkg_svn.bb
 DEPENDS = "curl"
 PROVIDES += "opkg"
 
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.4"
 
 SRCREV = "${SRCREV_pn-opkg}"
 
@@ -21,6 +21,7 @@ PV_vuplus = "0.1.7+svnr${SRCPV}"
 SRC_URI_append_opendreambox = " \
        file://remove_pyc_pyo_hack.patch;patch=1 \
        file://r531-fix-remove.patch;patch=1 \
+       file://r599-fix-depmod.patch;patch=1 \
 "
 SRC_URI_append_vuplus = " \
        file://remove_pyc_pyo_hack.patch;patch=1 \
index 097c375..e9d40da 100644 (file)
@@ -26,5 +26,3 @@ pkg_postinst_${PN} () {
 pkg_postrm_${PN} () {
   update-alternatives --remove opkg ${bindir}/opkg-cl
 }
-
-require update-alternatives-merge.inc
diff --git a/recipes/opkg/update-alternatives-merge.inc b/recipes/opkg/update-alternatives-merge.inc
deleted file mode 100644 (file)
index a07275d..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-# Moves all entries from /usr/lib/ipkg/alternatives to /usr/lib/opkg/alternatives
-# If it exists in both it use file with more lines
-
-pkg_postinst_${PN}_append () {
-        alternatives_dir_old="${prefix}/lib/ipkg/alternatives"
-        alternatives_dir_new="${prefix}/lib/opkg/alternatives"
-        if [ -e "${alternatives_dir_old}" ] ; then
-                if [ ! -e "${alternatives_dir_new}" ] ; then
-                        mkdir -p "${alternatives_dir_new}";
-                fi
-                echo "Old alternatives directory ${alternatives_dir_old} exists, moving entries to new one ${alternatives_dir_new}"
-                echo "Creating backup copy of both ${alternatives_dir_old}-backup and ${alternatives_dir_new}-backup"
-                cp -ra "${alternatives_dir_old}" "${alternatives_dir_old}-backup"
-                cp -ra "${alternatives_dir_new}" "${alternatives_dir_new}-backup"
-
-                cd ${alternatives_dir_old}
-                for alt_file in * ; do
-                        if [ ! -e "${alternatives_dir_new}/${alt_file}" ] ; then
-                                echo "Moving old '${alternatives_dir_old}/${alt_file}' to '${alternatives_dir_new}/${alt_file}'";
-                                mv -f "${alternatives_dir_old}/${alt_file}" "${alternatives_dir_new}/${alt_file}"
-                        else
-                                OLD_LINES=`wc -l ${alternatives_dir_old}/${alt_file} | cut -d/ -f 1`;
-                                NEW_LINES=`wc -l ${alternatives_dir_new}/${alt_file} | cut -d/ -f 1`;
-                                if [ $OLD_LINES -gt $NEW_LINES ] ; then
-                                        echo "Replacing '${alternatives_dir_new}/${alt_file}' with '${alternatives_dir_old}/${alt_file}'";
-                                        mv -f "${alternatives_dir_old}/${alt_file}" "${alternatives_dir_new}/${alt_file}"
-                                elif [ $OLD_LINES -eq $NEW_LINES ] ; then
-                                        if diff -q "${alternatives_dir_new}/${alt_file}" "${alternatives_dir_old}/${alt_file}" >/dev/null ; then
-                                                echo "'${alternatives_dir_new}/${alt_file}' is the same"
-                                        else
-                                                echo "WARN: You have to update manually if needed. Please check: diff '${alternatives_dir_old}-backup/${alt_file}' '${alternatives_dir_new}-backup/${alt_file}'"
-                                        fi
-                                else
-                                        echo "WARN: '${alternatives_dir_old}/${alt_file}' is shorter than new one, ignoring, but please check and update manually if needed"
-                                fi
-                        fi
-                done
-                rm -rf ${alternatives_dir_old}
-                echo "Merge finished, old directory '${alternatives_dir_old}' is removed"
-        fi
-}
diff --git a/recipes/realtek/r8712u/config b/recipes/realtek/r8712u/config
new file mode 100755 (executable)
index 0000000..6decb18
--- /dev/null
@@ -0,0 +1,27 @@
+\r
+#\r
+# Automatically generated make config: don't edit\r
+#\r
+\r
+CONFIG_RTL8711                 =       n\r
+CONFIG_RTL8712                 =       y\r
+\r
+\r
+CONFIG_USB_HCI                 =       y\r
+CONFIG_SDIO_HCI                        =       n\r
+\r
+\r
+CONFIG_MP_INCLUDED             =       y\r
+\r
+CONFIG_PLATFORM_I386_PC                =       n\r
+CONFIG_PLATFORM_ANDROID_X86    =       n\r
+CONFIG_PLATFORM_ARM_S3C                =       n\r
+CONFIG_PLATFORM_ARM_PXA                =       n\r
+CONFIG_PLATFORM_MIPS_RMI       =       n\r
+CONFIG_PLATFORM_RTK_DMP                =       n\r
+CONFIG_PLATFORM_MIPS_PLM       =       n\r
+CONFIG_PLATFORM_RTD2880B       =       n\r
+CONFIG_PLATFORM_MSTAR389       =       n\r
+\r
+CONFIG_MLME_EXT                        =       n\r
+CONFIG_DRVEXT_MODULE   = n\r
diff --git a/recipes/realtek/r8712u/strcasecmp.patch b/recipes/realtek/r8712u/strcasecmp.patch
new file mode 100644 (file)
index 0000000..0aea6d9
--- /dev/null
@@ -0,0 +1,14 @@
+diff --git a/ioctl/rtl871x_ioctl_linux.c b/ioctl/rtl871x_ioctl_linux.c
+index 6f707de..561c50f 100755
+--- a/ioctl/rtl871x_ioctl_linux.c
++++ b/ioctl/rtl871x_ioctl_linux.c
+@@ -52,6 +52,9 @@
+ #define  iwe_stream_add_point(a, b, c, d, e)  iwe_stream_add_point(b, c, d, e)\r
+ #endif\r
\r
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22))\r
++#define  strcasecmp(s1, s2)   strcmp(s1, s2)\r
++#endif\r
\r
+ #define RTL_IOCTL_WPA_SUPPLICANT      SIOCIWFIRSTPRIV+0x1E\r
\r
diff --git a/recipes/realtek/r8712u_2.6.6.0.20101111.bb b/recipes/realtek/r8712u_2.6.6.0.20101111.bb
new file mode 100644 (file)
index 0000000..dcb8fcc
--- /dev/null
@@ -0,0 +1,31 @@
+DESCRIPTION = "driver for Realtek USB wireless devices"
+HOMEPAGE = "http://www.realtek.com/"
+LICENSE = "GPLv2"
+
+SRC_URI = " \
+        http://dreamboxupdate.com/download/sources/rtl8712_8188_8191_8192SU_usb_linux_v${PV}.tar.gz \
+        file://strcasecmp.patch;patch=1 \
+        file://config \
+"
+
+S = "${WORKDIR}/rtl8712_8188_8191_8192SU_usb_linux_v${PV}"
+
+inherit module siteinfo
+
+PR = "r0"
+
+do_configure() {
+        install -m 644 ${WORKDIR}/config ${S}
+}
+do_install() {
+        unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+        oe_runmake -C ${STAGING_KERNEL_DIR} M=${S} DEPMOD=echo INSTALL_MOD_PATH="${D}" ${MODULE_MAKE_FLAGS} modules_install
+}
+
+MODULE_MAKE_FLAGS += " \
+        EXTRA_CFLAGS=-DCONFIG_${@base_conditional('SITEINFO_ENDIANESS', 'le', 'LITTLE', 'BIG', d)}_ENDIAN \
+        ARCH=${ARCH} \
+        CROSS_COMPILE=${TARGET_PREFIX} \
+        KVER=${KERNEL_VERSION} \
+        KSRC=${STAGING_KERNEL_DIR} \
+"
index 0d47dc2..c3b51b9 100644 (file)
@@ -9,7 +9,7 @@ inherit task
 # task-opendreambox-cdplayer
 #
 DESCRIPTION_${PN} = "OpenDreambox: CD-Player Support"
-DEPENDS_${PN} = "enigma2-plugins"
+DEPENDS = "enigma2-plugins"
 RDEPENDS_${PN} = "\
  kernel-module-cdfs \
  enigma2-plugin-extensions-cdinfo \
index 5a89ab9..d6e888c 100644 (file)
@@ -9,7 +9,7 @@ inherit task
 # task-opendreambox-dvdburn
 #
 DESCRIPTION_${PN} = "OpenDreambox: DVD-Burning Support"
-DEPENDS_${PN} = "enigma2"
+DEPENDS = "enigma2"
 RDEPENDS_${PN} = "\
   cdrkit \
   dvd+rw-tools \
index 2394b1b..25d41cd 100644 (file)
@@ -9,7 +9,7 @@ inherit task
 # task-opendreambox-dvdplayer
 #
 DESCRIPTION_${PN} = "OpenDreambox: DVD-Player Support"
-DEPENDS_${PN} = "enigma2
+DEPENDS = "enigma2"
 RDEPENDS_${PN} = "\
   kernel-module-udf \
   kernel-module-isofs \
index f1b34fe..5e276bd 100755 (executable)
@@ -1,7 +1,7 @@
 DESCRIPTION = "OpenDreambox: Enigma2 Task for the OpenDreambox Distribution"
 SECTION = "opendreambox/base"
 LICENSE = "MIT"
-PR = "r7"
+PR = "r8"
 
 inherit task
 
@@ -14,6 +14,10 @@ PACKAGES = "\
   task-opendreambox-enigma2 \
 "
 
+DEPENDS += "\
+  ${@base_contains("MACHINE_FEATURES", "dreambox-libpassthrough", "dreambox-libpassthrough", "", d)} \
+"
+
 #
 # task-opendreambox-enigma2
 #
@@ -53,6 +57,7 @@ RRECOMMENDS_task-opendreambox-enigma2 = "\
   enigma2-plugin-systemplugins-skinselector \
   ${@base_contains("MACHINE_FEATURES", "wifi", "task-opendreambox-wlan", "", d)} \
   ${@base_contains("MACHINE_FEATURES", "modem", "task-opendreambox-modem", "", d)} \
+  ${@base_contains("MACHINE_FEATURES", "dreambox-libpassthrough", "libpassthrough", "", d)} \
 "
 
 RDEPENDS_task-opendreambox-enigma2_append_dm500hd = "\
index 06e01be..42efbda 100644 (file)
@@ -9,7 +9,7 @@ inherit task
 # task-opendreambox-madwifi
 #
 DESCRIPTION_${PN} = "OpenDreambox: madwifi Support"
-DEPENDS_${PN} = "\
+DEPENDS = "\
   madwifi-ng \
 "
 
index b116d8b..0cd2972 100644 (file)
@@ -9,7 +9,7 @@ inherit task
 # task-opendreambox-modem
 #
 DESCRIPTION_${PN} = "OpenDreambox: Modem support"
-DEPENDS_${PN} = "enigma2-plugins"
+DEPENDS = "enigma2"
 RDEPENDS_${PN} = "\
   dreambox-modem-ppp-scripts \
   enigma2-plugin-extensions-modem \
index 7b78a67..949b81d 100644 (file)
@@ -1,7 +1,7 @@
 DESCRIPTION = "OpenDreambox: W-LAN Task for the OpenDreambox Distribution"
 SECTION = "opendreambox/base"
 LICENSE = "MIT"
-PR = "r3"
+PR = "r5"
 
 inherit task
 
@@ -9,7 +9,7 @@ inherit task
 # task-opendreambox-wlan
 #
 DESCRIPTION_${PN} = "OpenDreambox: W-LAN Support"
-DEPENDS_${PN} = "enigma2-plugins"
+DEPENDS = "enigma2"
 RDEPENDS_${PN} = "\
   enigma2-plugin-systemplugins-wirelesslan \
   wireless-tools \
@@ -42,6 +42,7 @@ WLAN_USB_MODULES = "\
 WLAN_USB_MODULES_LEGACY = "\
   zd1211b \
   wlan-rt73 \
+  r8712u \
 "
 
 RDEPENDS_${PN}_append_dm500hd = "\
@@ -64,6 +65,14 @@ RDEPENDS_${PN}_append_dm8000 = "\
   ${@base_contains('PREFERRED_VERSION_linux-dm8000', '2.6.18', 'task-opendreambox-madwifi', '${WLAN_CRYPTO_MODULES} ${WLAN_PCI_MODULES}', d)} \
 "
 
+DEPENDS_append_dm8000 = "\
+  ${@base_contains('PREFERRED_VERSION_linux-dm8000', '2.6.18', '${WLAN_USB_MODULES_LEGACY}', '${WLAN_CRYPTO_MODULES} ${WLAN_USB_MODULES}', d)} \
+"
+
+RSUGGESTS_${PN}_append_dm8000 = "\
+  ${@base_contains('PREFERRED_VERSION_linux-dm8000', '2.6.18', '${WLAN_USB_MODULES_LEGACY}', '${WLAN_CRYPTO_MODULES} ${WLAN_USB_MODULES}', d)} \
+"
+
 RDEPENDS_${PN}_append_dm7025 = "\
   ${@base_contains('PREFERRED_VERSION_linux-dm7025', '2.6.12.6', '${WLAN_USB_MODULES_LEGACY}', '${WLAN_CRYPTO_MODULES} ${WLAN_USB_MODULES}', d)} \
 "
index 23e3806..fe7521f 100644 (file)
@@ -16,6 +16,6 @@
 KERNEL=="fp0",                 NAME="dbox/fp0"
 KERNEL=="oled0",               NAME="dbox/oled0"
 KERNEL=="lcd0",                        NAME="dbox/lcd0"
-KERNEL=="pvr",                 NAME="misc/pvr"
 KERNEL=="hsm0",                        NAME="misc/hsm0"
 KERNEL=="vtuner0",             NAME="misc/vtuner0"
+KERNEL=="vtuner1",             NAME="misc/vtuner1"
index c58ab09..6aa7cb7 100755 (executable)
@@ -2,8 +2,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
 /dev/, handles hotplug events and loads drivers at boot time. It replaces \
 the hotplug package and requires a kernel not older than 2.6.12."
 RPROVIDES_${PN} = "hotplug"
-PR = "r19"
-PR_dm8000 = "r19"
+PR = "r20"
 
 SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
           file://noasmlinkage.patch;patch=1 \
index 111d8c6..ec4d6d6 100644 (file)
@@ -2,7 +2,7 @@ require update-alternatives-cworth.inc
 
 RPROVIDES_${PN} = "update-alternatives"
 
-PR="${INC_PR}.0"
+PR="${INC_PR}.1"
 
 do_install () {
     install -d ${D}${sbindir} \
@@ -11,5 +11,3 @@ do_install () {
 
     install -m 0755 update-alternatives ${D}${sbindir}/update-alternatives
 }
-
-require ../opkg/update-alternatives-merge.inc
index 28ad4e0..8d1340a 100644 (file)
@@ -103,3 +103,8 @@ ls_recurse_enable=YES
 #
 secure_chroot_dir=/dev/shm
 local_root=/
+
+# If enabled, vsftpd will display directory listings with the time in your
+# local time zone. The default is to display GMT. The times returned by the
+# MDTM FTP command are also affected by this option.
+use_localtime=YES
index 9424644..dbe459c 100755 (executable)
@@ -1,7 +1,7 @@
 DESCRIPTION = "Secure ftp daemon"
 SECTION = "console/network"
 LICENSE = "GPL"
-PR = "r3"
+PR = "r5"
 
 SRC_URI = "ftp://vsftpd.beasts.org/users/cevans/vsftpd-${PV}.tar.gz \
            file://makefile.patch;patch=1 \
@@ -47,9 +47,12 @@ do_install() {
 }
 
 pkg_postinst() {
+        if [ "x$D" != "x" ]; then
+                exit 1
+        fi
         addgroup ftp
         adduser --system --home /var/lib/ftp --no-create-home --ingroup ftp --disabled-password -s /bin/false ftp
-        mkdir -p ${D}${localstatedir}/share/empty
+        mkdir -p ${localstatedir}/share/empty
 }
 
 INITSCRIPT_NAME = "vsftpd"
diff --git a/recipes/zeroconf/files/opendreambox/zeroconf-default b/recipes/zeroconf/files/opendreambox/zeroconf-default
new file mode 100644 (file)
index 0000000..d1967e8
--- /dev/null
@@ -0,0 +1,17 @@
+# Default for zeroconf
+
+# disable zeroconf
+# If you want to disable zeroconf completely, uncomment the following line
+# this may be useful if you are debugging zeroconf or starting it manually
+#DISABLE=yes
+
+# black-listed interfaces
+# Interfaces which you never wish to have zeroconf run on should
+# be listed here. e.g. "eth2 wlan1" in a space seperated string
+IFBLACKLIST=""
+
+# fallback only
+# If you would only like a link-local address if you were unable to
+# obtain an address via DHCP then uncomment the following line
+FALLBACK=yes
+
index 2857247..827d159 100644 (file)
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 SECTION = "net"
 PRIORITY = "optional"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://www.progsoc.org/~wildfire/zeroconf/download/${PN}-${PV}.tar.gz \
           file://zeroconf-default \