25663 2011-05-24 13:47:38 +0400 [FR] add whichsys.c32 2011-05-25 19:19:53 +0400 1 1 4 Development Sisyphus syslinux unstable all Linux CLOSED FIXED http://lists.altlinux.org/pipermail/sisyphus/2011-May/354240.html P3 enhancement --- 1 mike nobody boyarsh vsu qa-sisyphus oldest_to_newest 121597 0 4952 mike 2011-05-24 13:47:38 +0400 Created attachment 4952 syslinux-3.82-whichsys.diff Предлагаю добавить whichsys.c32 для обеспечения возможности реализации загрузки с локального диска вне зависимости от того, находится ли hybrid iso на CD/DVD или USB Flash: http://syslinux.zytor.com/wiki/index.php/Whichsys.c32 Для этого нужны два коммита из syslinux 4.x, по словам vsu@: > git cherry-pick 66c3eb4f6fc622fc3326956adfb0c6e23342b98f > git cherry-pick fd4d6e5845b9b84b25850bb2a908a23f7bb0c9de > Ничего такого, что требовало бы именно syslinux-4.x, в этом > модуле на самом деле нет. Слил в syslinux-3.82-whichsys.diff согласно текущей схеме syslinux.git, проверяю. 121598 1 4953 mike 2011-05-24 14:01:02 +0400 Created attachment 4953 syslinux-3.82-whichsys.diff (updated) Притёр по списку модулей в makefile патч, сборка взрывается: whichsys.c:35:5: error: expected specifier-qualifier-list before 'bool' whichsys.c: In function 'main': whichsys.c:95:14: error: 'struct syslinux_parameter' has no member named 'option' whichsys.c:95:24: error: 'true' undeclared (first use in this function) whichsys.c:95:24: note: each undeclared identifier is reported only once for each function it appears in whichsys.c:100:14: error: 'struct syslinux_parameter' has no member named 'option' whichsys.c:105:14: error: 'struct syslinux_parameter' has no member named 'option' whichsys.c:114:14: error: 'struct syslinux_parameter' has no member named 'option' whichsys.c:117:14: error: 'struct syslinux_parameter' has no member named 'option' whichsys.c:120:14: error: 'struct syslinux_parameter' has no member named 'option' 121616 2 vsu 2011-05-24 22:34:18 +0400 Видно же, что не хватает #include <stdbool.h> (в не таких тухлых версиях syslinux-3.x он цепляется через com32.h). 121630 3 4955 mike 2011-05-25 13:20:49 +0400 Created attachment 4955 syslinux-3.82-whichsys.diff (builds) Н-да, мне оказалось не видно. Спасибо, так собралось. 121632 4 mike 2011-05-25 13:39:31 +0400 Пушнул к себе в git; дистрибутив для проверки ещё не делал, хотя хороший повод обновить свою флэшку :) 121639 5 zerg 2011-05-25 14:23:21 +0400 (В ответ на комментарий №2) > в не таких тухлых версиях Теперь можно погонять в Сизифе syslinux-3.86 (http://download.opensuse.org/source/distribution/11.4/repo/oss/suse/src/) 121640 6 zerg 2011-05-25 14:23:22 +0400 (В ответ на комментарий №2) > в не таких тухлых версиях Теперь можно погонять в Сизифе syslinux-3.86 (http://download.opensuse.org/source/distribution/11.4/repo/oss/suse/src/) 121648 7 zerg 2011-05-25 18:21:09 +0400 syslinux-3.86-alt3 121649 8 zerg 2011-05-25 18:21:10 +0400 syslinux-3.86-alt3 121650 9 mike 2011-05-25 19:19:53 +0400 Спасибо, будем посмотреть :) 4952 2011-05-24 13:47:38 +0400 2011-05-24 14:01:02 +0400 syslinux-3.82-whichsys.diff syslinux-3.82-whichsys.diff text/plain 6366 mike RnJvbSA2NmMzZWI0ZjZmYzYyMmZjMzMyNjk1NmFkZmIwYzZlMjMzNDJiOThmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHZXJ0IEh1bHNlbG1hbnMgPGdlcnRoQHp5dG9yLmNvbT4KRGF0 ZTogTW9uLCA1IEp1bCAyMDEwIDIzOjUyOjM5ICswMjAwClN1YmplY3Q6IFtQQVRDSF0gd2hpY2hz eXMuYzMyOiBleGVjdXRlIHNwZWNpZmljIGNvbW1hbmQsIGJhc2VkIG9uIFN5c2xpbnV4CiBib290 bG9hZGVyIHZhcmlhbnQKCkRldGVtaW5lIHdoaWNoIGNvbW1hbmQgdG8gZXhlY3V0ZSwgYmFzZWQg b24gdGhlIFN5c2xpbnV4IGJvb3Rsb2FkZXIgdmFyaWFudApmcm9tIHdoaWNoIHlvdSBydW4gaXQu CgogIFVzYWdlOiAgICB3aGljaHN5cy5jMzIgWy1pc28tIGNvbW1hbmRdIFstcHhlLSBjb21tYW5k XSBbLXN5cy0gY29tbWFuZF0KICBFeGFtcGxlczogd2hpY2hzeXMuYzMyIC1pc28tIGNoYWluLmMz MiBoZDAgLXN5cy0gY2hhaW4uYzMyIGhkMSBzd2FwCiAgICAgICAgICAgIHdoaWNoc3lzLmMzMiAt aXNvLSBjb25maWcgaXNvLmNmZyAtc3lzLSBzeXMuY2ZnIC1weGUtIHB4ZS5jZmcKClNpZ25lZC1v ZmYtYnk6IEdlcnQgSHVsc2VsbWFucyA8Z2VydGhAenl0b3IuY29tPgotLS0KIGNvbTMyL21vZHVs ZXMvTWFrZWZpbGUgICB8ICAgIDIgKy0KIGNvbTMyL21vZHVsZXMvd2hpY2hzeXMuYyB8ICAxMjgg KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogMiBmaWxlcyBj aGFuZ2VkLCAxMjkgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEw MDY0NCBjb20zMi9tb2R1bGVzL3doaWNoc3lzLmMKCmRpZmYgLS1naXQgYS9jb20zMi9tb2R1bGVz L01ha2VmaWxlIGIvY29tMzIvbW9kdWxlcy9NYWtlZmlsZQppbmRleCBmNDJjZTk2Li4yZDQ3OTEz IDEwMDY0NAotLS0gYS9jb20zMi9tb2R1bGVzL01ha2VmaWxlCisrKyBiL2NvbTMyL21vZHVsZXMv TWFrZWZpbGUKQEAgLTIyLDcgKzIyLDcgQEAgTU9EVUxFUwkgID0gY2hhaW4uYzMyIGNvbmZpZy5j MzIgZXRoZXJzZWwuYzMyIGRtaXRlc3QuYzMyIGNwdWlkdGVzdC5jMzIgXAogCSAgICBkaXNrLmMz MiBwY2l0ZXN0LmMzMiBlbGYuYzMyIGxpbnV4LmMzMiByZWJvb3QuYzMyIHBtbG9hZC5jMzIgXAog CSAgICBtZW1pbmZvLmMzMiBzZGkuYzMyIHNhbmJvb3QuYzMyIGlmY3B1NjQuYzMyIHZlc2FpbmZv LmMzMiBcCiAJICAgIGtiZG1hcC5jMzIgY21kLmMzMiB2cGR0ZXN0LmMzMiBob3N0LmMzMiBscy5j MzIgZ3B4ZWNtZC5jMzIgXAotCSAgICBpZmNwdS5jMzIgY3B1aWQuYzMyIGNhdC5jMzIgcHdkLmMz MiBpZnBsb3AuYzMyCisJICAgIGlmY3B1LmMzMiBjcHVpZC5jMzIgY2F0LmMzMiBwd2QuYzMyIGlm cGxvcC5jMzIgd2hpY2hzeXMuYzMyCiAKIFRFU1RGSUxFUyA9CiAKZGlmZiAtLWdpdCBhL2NvbTMy L21vZHVsZXMvd2hpY2hzeXMuYyBiL2NvbTMyL21vZHVsZXMvd2hpY2hzeXMuYwpuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jMTg2NzIyCi0tLSAvZGV2L251bGwKKysrIGIvY29t MzIvbW9kdWxlcy93aGljaHN5cy5jCkBAIC0wLDAgKzEsMTI4IEBACisvKiAtLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LSAqCisgKgorICogICBDb3B5cmlnaHQgMjAxMCBHZXJ0IEh1bHNlbG1hbnMgLSBBbGwgUmlnaHRz IFJlc2VydmVkCisgKgorICogICBUaGlzIHByb2dyYW0gaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNh biByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1vZGlmeQorICogICBpdCB1bmRlciB0aGUgdGVybXMg b2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieQorICogICB0 aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuLCA1MSBGcmFua2xpbiBTdCwgRmlmdGgg Rmxvb3IsCisgKiAgIEJvc3RvbiBNQSAwMjExMC0xMzAxLCBVU0E7IGVpdGhlciB2ZXJzaW9uIDIg b2YgdGhlIExpY2Vuc2UsIG9yCisgKiAgIChhdCB5b3VyIG9wdGlvbikgYW55IGxhdGVyIHZlcnNp b247IGluY29ycG9yYXRlZCBoZXJlaW4gYnkgcmVmZXJlbmNlLgorICoKKyAqIC0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tICovCisKKy8qCisgKiB3aGljaHN5cy5jCisgKgorICogRGV0ZW1pbmUgd2hpY2ggY29tbWFu ZCB0byBleGVjdXRlLCBiYXNlZCBvbiB0aGUgU3lzbGludXggYm9vdGxvYWRlciB2YXJpYW50Cisg KiBmcm9tIHdoaWNoIHlvdSBydW4gaXQuCisgKgorICogVXNhZ2U6ICAgIHdoaWNoc3lzLmMzMiBb LWlzby0gY29tbWFuZF0gWy1weGUtIGNvbW1hbmRdIFstc3lzLSBjb21tYW5kXQorICogRXhhbXBs ZXM6IHdoaWNoc3lzLmMzMiAtaXNvLSBjaGFpbi5jMzIgaGQwIC1zeXMtIGNoYWluLmMzMiBoZDEg c3dhcAorICogICAgICAgICAgIHdoaWNoc3lzLmMzMiAtaXNvLSBjb25maWcgaXNvLmNmZyAtc3lz LSBzeXMuY2ZnIC1weGUtIHB4ZS5jZmcKKyAqCisgKi8KKworI2luY2x1ZGUgPHN0ZGlvLmg+Cisj aW5jbHVkZSA8YWxsb2NhLmg+CisjaW5jbHVkZSA8Y29uc29sZS5oPgorI2luY2x1ZGUgPHN0cmlu Zy5oPgorI2luY2x1ZGUgPHN5c2xpbnV4L2Jvb3QuaD4KKyNpbmNsdWRlICJzeXNsaW51eC9jb25m aWcuaCIKKworCitzdGF0aWMgc3RydWN0IHN5c2xpbnV4X3BhcmFtZXRlciB7CisgICAgY2hhciAq KmFyZ1sxXTsKKyAgICBib29sIG9wdGlvbjsKK30gaXNvbGludXgsIHB4ZWxpbnV4LCBzeXNsaW51 eDsKKworLyogWFhYOiB0aGlzIHJlYWxseSBzaG91bGQgYmUgbGlicmFyaXplZCAqLworc3RhdGlj IHZvaWQgYm9vdF9hcmdzKGNoYXIgKiphcmdzKQoreworICAgIGludCBsZW4gPSAwLCBhID0gMDsK KyAgICBjaGFyICoqcHA7CisgICAgY29uc3QgY2hhciAqcDsKKyAgICBjaGFyIGMsICpxLCAqc3Ry OworCisgICAgZm9yIChwcCA9IGFyZ3M7ICpwcDsgcHArKykKKwlsZW4gKz0gc3RybGVuKCpwcCkg KyAxOworCisgICAgcSA9IHN0ciA9IGFsbG9jYShsZW4pOworICAgIGZvciAocHAgPSBhcmdzOyAq cHA7IHBwKyspIHsKKwlwID0gKnBwOworCXdoaWxlICgoYyA9ICpwKyspKQorCSAgICAqcSsrID0g YzsKKwkqcSsrID0gJyAnOworCWEgPSAxOworICAgIH0KKyAgICBxIC09IGE7CisgICAgKnEgPSAn XDAnOworCisgICAgaWYgKCFzdHJbMF0pCisJc3lzbGludXhfcnVuX2RlZmF1bHQoKTsKKyAgICBl bHNlCisJc3lzbGludXhfcnVuX2NvbW1hbmQoc3RyKTsKK30KKworc3RhdGljIHZvaWQgdXNhZ2Uo dm9pZCkKK3sKKyAgICBzdGF0aWMgY29uc3QgY2hhciB1c2FnZVtdID0gIlwKK1VzYWdlOiAgICB3 aGljaHN5cy5jMzIgWy1pc28tIGNvbW1hbmRdIFstcHhlLSBjb21tYW5kXSBbLXN5cy0gY29tbWFu ZF1cblwKK0V4YW1wbGVzOiB3aGljaHN5cy5jMzIgLWlzby0gY2hhaW4uYzMyIGhkMCAtc3lzLSBj aGFpbi5jMzIgaGQxIHN3YXBcblwKKyAgICAgICAgICB3aGljaHN5cy5jMzIgLWlzby0gY29uZmln IGlzby5jZmcgLXN5cy0gc3lzLmNmZyAtcHhlLSBweGUuY2ZnXG4iOworICAgIGZwcmludGYoc3Rk ZXJyLCB1c2FnZSk7Cit9CisKK2ludCBtYWluKGludCBhcmdjLCBjaGFyICphcmd2W10pCit7Cisg ICAgY29uc3QgdW5pb24gc3lzbGludXhfZGVyaXZhdGl2ZV9pbmZvICpzZGk7CisKKyAgICBpbnQg YXJnID0gMDsKKworICAgIG9wZW5jb25zb2xlKCZkZXZfbnVsbF9yLCAmZGV2X3N0ZGNvbl93KTsK KworICAgIC8qIElmIG5vIGFyZ3VtZW50IGdvdCBwYXNzZWQsIGxldCdzIHNob3cgdGhlIHVzYWdl ICovCisgICAgaWYgKGFyZ2MgPT0gMSkgeworCSAgICB1c2FnZSgpOworCSAgICByZXR1cm4gMDsK KyAgICB9CisKKyAgICBhcmcrKzsKKworICAgIHdoaWxlIChhcmcgPCBhcmdjKSB7CisJaWYgKCFz dHJjbXAoYXJndlthcmddLCAiLWlzby0iKSkgeworCSAgICBhcmd2W2FyZ10gPSBOVUxMOworCSAg ICBpc29saW51eC5hcmdbMF0gPSAmYXJndlthcmcgKyAxXTsKKwkgICAgaXNvbGludXgub3B0aW9u ID0gdHJ1ZTsKKwl9CisJaWYgKCFzdHJjbXAoYXJndlthcmddLCAiLXB4ZS0iKSkgeworCSAgICBh cmd2W2FyZ10gPSBOVUxMOworCSAgICBweGVsaW51eC5hcmdbMF0gPSAmYXJndlthcmcgKyAxXTsK KwkgICAgcHhlbGludXgub3B0aW9uID0gdHJ1ZTsKKwl9CisJaWYgKCFzdHJjbXAoYXJndlthcmdd LCAiLXN5cy0iKSkgeworCSAgICBhcmd2W2FyZ10gPSBOVUxMOworCSAgICBzeXNsaW51eC5hcmdb MF0gPSAmYXJndlthcmcgKyAxXTsKKwkgICAgc3lzbGludXgub3B0aW9uID0gdHJ1ZTsKKwl9CisJ YXJnKys7CisgICAgfQorCisgICAgc2RpID0gc3lzbGludXhfZGVyaXZhdGl2ZV9pbmZvKCk7CisK KyAgICBzd2l0Y2ggKHNkaS0+Yy5maWxlc3lzdGVtKSB7CisJY2FzZSBTWVNMSU5VWF9GU19JU09M SU5VWDoKKwkgICAgaXNvbGludXgub3B0aW9uID8gYm9vdF9hcmdzKGlzb2xpbnV4LmFyZ1swXSkg OiBmcHJpbnRmKHN0ZGVyciwgIk5vIGNvbW1hbmQgc3BlY2lmaWVkIGZvciBJU09MSU5VWC5cblxu Iik7IHVzYWdlKCk7CisJICAgIGJyZWFrOworCWNhc2UgU1lTTElOVVhfRlNfUFhFTElOVVg6CisJ ICAgIHB4ZWxpbnV4Lm9wdGlvbiA/IGJvb3RfYXJncyhweGVsaW51eC5hcmdbMF0pIDogZnByaW50 ZihzdGRlcnIsICJObyBjb21tYW5kIHNwZWNpZmllZCBmb3IgUFhFTElOVVguXG5cbiIpOyB1c2Fn ZSgpOworCSAgICBicmVhazsKKwljYXNlIFNZU0xJTlVYX0ZTX1NZU0xJTlVYOgorCSAgICBzeXNs aW51eC5vcHRpb24gPyBib290X2FyZ3Moc3lzbGludXguYXJnWzBdKSA6IGZwcmludGYoc3RkZXJy LCAiTm8gY29tbWFuZCBzcGVjaWZpZWQgZm9yIFNZU0xJTlVYLlxuXG4iKTsgdXNhZ2UoKTsKKwkg ICAgYnJlYWs7CisJY2FzZSBTWVNMSU5VWF9GU19VTktOT1dOOgorCWRlZmF1bHQ6CisJICAgIGZw cmludGYoc3RkZXJyLCAiVW5rbm93biBTeXNsaW51eCBmaWxlc3lzdGVtXG5cbiIpOworICAgIH0K KworICAgIHJldHVybiAtMTsKK30KLS0gCjEuNy40LjUKCkZyb20gZmQ0ZDZlNTg0NWI5Yjg0YjI1 ODUwYmIyYTkwOGEyM2Y3YmIwYzlkZSBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKRnJvbTogR2Vy dCBIdWxzZWxtYW5zIDxnZXJ0aEB6eXRvci5jb20+CkRhdGU6IFR1ZSwgMTMgSnVsIDIwMTAgMDA6 MjY6MDkgKzAyMDAKU3ViamVjdDogW1BBVENIXSB3aGljaHN5cy5jMzI6IEZpeCBleGFtcGxlIGlu IHRoZSBjb21tZW50cyBhbmQgVXNhZ2Ugb3V0cHV0CgpGaXggZXhhbXBsZSBpbiB0aGUgY29tbWVu dHMgYW5kIFVzYWdlIG91dHB1dC4KClNpZ25lZC1vZmYtYnk6IEdlcnQgSHVsc2VsbWFucyA8Z2Vy dGhAenl0b3IuY29tPgotLS0KIGNvbTMyL21vZHVsZXMvd2hpY2hzeXMuYyB8ICAgIDQgKystLQog MSBmaWxlcyBjaGFuZ2VkLCAyIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvY29tMzIvbW9kdWxlcy93aGljaHN5cy5jIGIvY29tMzIvbW9kdWxlcy93aGljaHN5cy5j CmluZGV4IGMxODY3MjIuLmFmMTMzZjIgMTAwNjQ0Ci0tLSBhL2NvbTMyL21vZHVsZXMvd2hpY2hz eXMuYworKysgYi9jb20zMi9tb2R1bGVzL3doaWNoc3lzLmMKQEAgLTE4LDcgKzE4LDcgQEAKICAq CiAgKiBVc2FnZTogICAgd2hpY2hzeXMuYzMyIFstaXNvLSBjb21tYW5kXSBbLXB4ZS0gY29tbWFu ZF0gWy1zeXMtIGNvbW1hbmRdCiAgKiBFeGFtcGxlczogd2hpY2hzeXMuYzMyIC1pc28tIGNoYWlu LmMzMiBoZDAgLXN5cy0gY2hhaW4uYzMyIGhkMSBzd2FwCi0gKiAgICAgICAgICAgd2hpY2hzeXMu YzMyIC1pc28tIGNvbmZpZyBpc28uY2ZnIC1zeXMtIHN5cy5jZmcgLXB4ZS0gcHhlLmNmZworICog ICAgICAgICAgIHdoaWNoc3lzLmMzMiAtaXNvLSBjb25maWcgaXNvLmNmZyAtcHhlLSBjb25maWcg cHhlLmNmZwogICoKICAqLwogCkBAIC02OCw3ICs2OCw3IEBAIHN0YXRpYyB2b2lkIHVzYWdlKHZv aWQpCiAgICAgc3RhdGljIGNvbnN0IGNoYXIgdXNhZ2VbXSA9ICJcCiBVc2FnZTogICAgd2hpY2hz eXMuYzMyIFstaXNvLSBjb21tYW5kXSBbLXB4ZS0gY29tbWFuZF0gWy1zeXMtIGNvbW1hbmRdXG5c CiBFeGFtcGxlczogd2hpY2hzeXMuYzMyIC1pc28tIGNoYWluLmMzMiBoZDAgLXN5cy0gY2hhaW4u YzMyIGhkMSBzd2FwXG5cCi0gICAgICAgICAgd2hpY2hzeXMuYzMyIC1pc28tIGNvbmZpZyBpc28u Y2ZnIC1zeXMtIHN5cy5jZmcgLXB4ZS0gcHhlLmNmZ1xuIjsKKyAgICAgICAgICB3aGljaHN5cy5j MzIgLWlzby0gY29uZmlnIGlzby5jZmcgLXB4ZS0gY29uZmlnIHB4ZS5jZmdcbiI7CiAgICAgZnBy aW50ZihzdGRlcnIsIHVzYWdlKTsKIH0KIAotLSAKMS43LjQuNQoK 4953 2011-05-24 14:01:02 +0400 2011-05-25 13:20:49 +0400 syslinux-3.82-whichsys.diff (updated) syslinux-3.82-whichsys.diff text/plain 4271 mike ZGlmZiAtTmF1ciBzeXNsaW51eC0zLjgyLW9yaWcvY29tMzIvbW9kdWxlcy9NYWtlZmlsZSBzeXNs aW51eC0zLjgyL2NvbTMyL21vZHVsZXMvTWFrZWZpbGUKLS0tIHN5c2xpbnV4LTMuODItb3JpZy9j b20zMi9tb2R1bGVzL01ha2VmaWxlCTIwMTEtMDUtMjQgMDk6NDg6MDguMDAwMDAwMDAwICswMDAw CisrKyBzeXNsaW51eC0zLjgyL2NvbTMyL21vZHVsZXMvTWFrZWZpbGUJMjAxMS0wNS0yNCAwOTo1 MjozNC4xNTM0NjA2ODUgKzAwMDAKQEAgLTIxLDcgKzIxLDcgQEAKIE1PRFVMRVMJICA9IGNoYWlu LmMzMiBjb25maWcuYzMyIGV0aGVyc2VsLmMzMiBkbWl0ZXN0LmMzMiBjcHVpZHRlc3QuYzMyIFwK IAkgICAgcGNpdGVzdC5jMzIgZWxmLmMzMiBsaW51eC5jMzIgcmVib290LmMzMiBwbWxvYWQuYzMy IG1lbWluZm8uYzMyIFwKIAkgICAgc2RpLmMzMiBzYW5ib290LmMzMiBpZmNwdTY0LmMzMiB2ZXNh aW5mby5jMzIga2JkbWFwLmMzMiBjbWQuYzMyIFwKLQkgICAgdnBkdGVzdC5jMzIKKwkgICAgdnBk dGVzdC5jMzIgd2hpY2hzeXMuYzMyCiAKIFRFU1RGSUxFUyA9CiAKZGlmZiAtTmF1ciBzeXNsaW51 eC0zLjgyLW9yaWcvY29tMzIvbW9kdWxlcy93aGljaHN5cy5jIHN5c2xpbnV4LTMuODIvY29tMzIv bW9kdWxlcy93aGljaHN5cy5jCi0tLSBzeXNsaW51eC0zLjgyLW9yaWcvY29tMzIvbW9kdWxlcy93 aGljaHN5cy5jCTE5NzAtMDEtMDEgMDA6MDA6MDAuMDAwMDAwMDAwICswMDAwCisrKyBzeXNsaW51 eC0zLjgyL2NvbTMyL21vZHVsZXMvd2hpY2hzeXMuYwkyMDExLTA1LTI0IDA5OjUyOjE1LjIzNjAy MzMxMCArMDAwMApAQCAtMCwwICsxLDEyOCBAQAorLyogLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0gKgorICoKKyAq ICAgQ29weXJpZ2h0IDIwMTAgR2VydCBIdWxzZWxtYW5zIC0gQWxsIFJpZ2h0cyBSZXNlcnZlZAor ICoKKyAqICAgVGhpcyBwcm9ncmFtIGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmli dXRlIGl0IGFuZC9vciBtb2RpZnkKKyAqICAgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUg R2VuZXJhbCBQdWJsaWMgTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkKKyAqICAgdGhlIEZyZWUgU29m dHdhcmUgRm91bmRhdGlvbiwgSW5jLiwgNTEgRnJhbmtsaW4gU3QsIEZpZnRoIEZsb29yLAorICog ICBCb3N0b24gTUEgMDIxMTAtMTMwMSwgVVNBOyBlaXRoZXIgdmVyc2lvbiAyIG9mIHRoZSBMaWNl bnNlLCBvcgorICogICAoYXQgeW91ciBvcHRpb24pIGFueSBsYXRlciB2ZXJzaW9uOyBpbmNvcnBv cmF0ZWQgaGVyZWluIGJ5IHJlZmVyZW5jZS4KKyAqCisgKiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSAqLworCisv KgorICogd2hpY2hzeXMuYworICoKKyAqIERldGVtaW5lIHdoaWNoIGNvbW1hbmQgdG8gZXhlY3V0 ZSwgYmFzZWQgb24gdGhlIFN5c2xpbnV4IGJvb3Rsb2FkZXIgdmFyaWFudAorICogZnJvbSB3aGlj aCB5b3UgcnVuIGl0LgorICoKKyAqIFVzYWdlOiAgICB3aGljaHN5cy5jMzIgWy1pc28tIGNvbW1h bmRdIFstcHhlLSBjb21tYW5kXSBbLXN5cy0gY29tbWFuZF0KKyAqIEV4YW1wbGVzOiB3aGljaHN5 cy5jMzIgLWlzby0gY2hhaW4uYzMyIGhkMCAtc3lzLSBjaGFpbi5jMzIgaGQxIHN3YXAKKyAqICAg ICAgICAgICB3aGljaHN5cy5jMzIgLWlzby0gY29uZmlnIGlzby5jZmcgLXB4ZS0gY29uZmlnIHB4 ZS5jZmcKKyAqCisgKi8KKworI2luY2x1ZGUgPHN0ZGlvLmg+CisjaW5jbHVkZSA8YWxsb2NhLmg+ CisjaW5jbHVkZSA8Y29uc29sZS5oPgorI2luY2x1ZGUgPHN0cmluZy5oPgorI2luY2x1ZGUgPHN5 c2xpbnV4L2Jvb3QuaD4KKyNpbmNsdWRlICJzeXNsaW51eC9jb25maWcuaCIKKworCitzdGF0aWMg c3RydWN0IHN5c2xpbnV4X3BhcmFtZXRlciB7CisgICAgY2hhciAqKmFyZ1sxXTsKKyAgICBib29s IG9wdGlvbjsKK30gaXNvbGludXgsIHB4ZWxpbnV4LCBzeXNsaW51eDsKKworLyogWFhYOiB0aGlz IHJlYWxseSBzaG91bGQgYmUgbGlicmFyaXplZCAqLworc3RhdGljIHZvaWQgYm9vdF9hcmdzKGNo YXIgKiphcmdzKQoreworICAgIGludCBsZW4gPSAwLCBhID0gMDsKKyAgICBjaGFyICoqcHA7Cisg ICAgY29uc3QgY2hhciAqcDsKKyAgICBjaGFyIGMsICpxLCAqc3RyOworCisgICAgZm9yIChwcCA9 IGFyZ3M7ICpwcDsgcHArKykKKwlsZW4gKz0gc3RybGVuKCpwcCkgKyAxOworCisgICAgcSA9IHN0 ciA9IGFsbG9jYShsZW4pOworICAgIGZvciAocHAgPSBhcmdzOyAqcHA7IHBwKyspIHsKKwlwID0g KnBwOworCXdoaWxlICgoYyA9ICpwKyspKQorCSAgICAqcSsrID0gYzsKKwkqcSsrID0gJyAnOwor CWEgPSAxOworICAgIH0KKyAgICBxIC09IGE7CisgICAgKnEgPSAnXDAnOworCisgICAgaWYgKCFz dHJbMF0pCisJc3lzbGludXhfcnVuX2RlZmF1bHQoKTsKKyAgICBlbHNlCisJc3lzbGludXhfcnVu X2NvbW1hbmQoc3RyKTsKK30KKworc3RhdGljIHZvaWQgdXNhZ2Uodm9pZCkKK3sKKyAgICBzdGF0 aWMgY29uc3QgY2hhciB1c2FnZVtdID0gIlwKK1VzYWdlOiAgICB3aGljaHN5cy5jMzIgWy1pc28t IGNvbW1hbmRdIFstcHhlLSBjb21tYW5kXSBbLXN5cy0gY29tbWFuZF1cblwKK0V4YW1wbGVzOiB3 aGljaHN5cy5jMzIgLWlzby0gY2hhaW4uYzMyIGhkMCAtc3lzLSBjaGFpbi5jMzIgaGQxIHN3YXBc blwKKyAgICAgICAgICB3aGljaHN5cy5jMzIgLWlzby0gY29uZmlnIGlzby5jZmcgLXB4ZS0gY29u ZmlnIHB4ZS5jZmdcbiI7CisgICAgZnByaW50ZihzdGRlcnIsIHVzYWdlKTsKK30KKworaW50IG1h aW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKK3sKKyAgICBjb25zdCB1bmlvbiBzeXNsaW51eF9k ZXJpdmF0aXZlX2luZm8gKnNkaTsKKworICAgIGludCBhcmcgPSAwOworCisgICAgb3BlbmNvbnNv bGUoJmRldl9udWxsX3IsICZkZXZfc3RkY29uX3cpOworCisgICAgLyogSWYgbm8gYXJndW1lbnQg Z290IHBhc3NlZCwgbGV0J3Mgc2hvdyB0aGUgdXNhZ2UgKi8KKyAgICBpZiAoYXJnYyA9PSAxKSB7 CisJICAgIHVzYWdlKCk7CisJICAgIHJldHVybiAwOworICAgIH0KKworICAgIGFyZysrOworCisg ICAgd2hpbGUgKGFyZyA8IGFyZ2MpIHsKKwlpZiAoIXN0cmNtcChhcmd2W2FyZ10sICItaXNvLSIp KSB7CisJICAgIGFyZ3ZbYXJnXSA9IE5VTEw7CisJICAgIGlzb2xpbnV4LmFyZ1swXSA9ICZhcmd2 W2FyZyArIDFdOworCSAgICBpc29saW51eC5vcHRpb24gPSB0cnVlOworCX0KKwlpZiAoIXN0cmNt cChhcmd2W2FyZ10sICItcHhlLSIpKSB7CisJICAgIGFyZ3ZbYXJnXSA9IE5VTEw7CisJICAgIHB4 ZWxpbnV4LmFyZ1swXSA9ICZhcmd2W2FyZyArIDFdOworCSAgICBweGVsaW51eC5vcHRpb24gPSB0 cnVlOworCX0KKwlpZiAoIXN0cmNtcChhcmd2W2FyZ10sICItc3lzLSIpKSB7CisJICAgIGFyZ3Zb YXJnXSA9IE5VTEw7CisJICAgIHN5c2xpbnV4LmFyZ1swXSA9ICZhcmd2W2FyZyArIDFdOworCSAg ICBzeXNsaW51eC5vcHRpb24gPSB0cnVlOworCX0KKwlhcmcrKzsKKyAgICB9CisKKyAgICBzZGkg PSBzeXNsaW51eF9kZXJpdmF0aXZlX2luZm8oKTsKKworICAgIHN3aXRjaCAoc2RpLT5jLmZpbGVz eXN0ZW0pIHsKKwljYXNlIFNZU0xJTlVYX0ZTX0lTT0xJTlVYOgorCSAgICBpc29saW51eC5vcHRp b24gPyBib290X2FyZ3MoaXNvbGludXguYXJnWzBdKSA6IGZwcmludGYoc3RkZXJyLCAiTm8gY29t bWFuZCBzcGVjaWZpZWQgZm9yIElTT0xJTlVYLlxuXG4iKTsgdXNhZ2UoKTsKKwkgICAgYnJlYWs7 CisJY2FzZSBTWVNMSU5VWF9GU19QWEVMSU5VWDoKKwkgICAgcHhlbGludXgub3B0aW9uID8gYm9v dF9hcmdzKHB4ZWxpbnV4LmFyZ1swXSkgOiBmcHJpbnRmKHN0ZGVyciwgIk5vIGNvbW1hbmQgc3Bl Y2lmaWVkIGZvciBQWEVMSU5VWC5cblxuIik7IHVzYWdlKCk7CisJICAgIGJyZWFrOworCWNhc2Ug U1lTTElOVVhfRlNfU1lTTElOVVg6CisJICAgIHN5c2xpbnV4Lm9wdGlvbiA/IGJvb3RfYXJncyhz eXNsaW51eC5hcmdbMF0pIDogZnByaW50ZihzdGRlcnIsICJObyBjb21tYW5kIHNwZWNpZmllZCBm b3IgU1lTTElOVVguXG5cbiIpOyB1c2FnZSgpOworCSAgICBicmVhazsKKwljYXNlIFNZU0xJTlVY X0ZTX1VOS05PV046CisJZGVmYXVsdDoKKwkgICAgZnByaW50ZihzdGRlcnIsICJVbmtub3duIFN5 c2xpbnV4IGZpbGVzeXN0ZW1cblxuIik7CisgICAgfQorCisgICAgcmV0dXJuIC0xOworfQo= 4955 2011-05-25 13:20:49 +0400 2011-05-25 13:20:49 +0400 syslinux-3.82-whichsys.diff (builds) syslinux-3.82-whichsys.diff text/plain 4293 mike ZGlmZiAtTmF1ciBzeXNsaW51eC0zLjgyLW9yaWcvY29tMzIvbW9kdWxlcy9NYWtlZmlsZSBzeXNs aW51eC0zLjgyL2NvbTMyL21vZHVsZXMvTWFrZWZpbGUKLS0tIHN5c2xpbnV4LTMuODItb3JpZy9j b20zMi9tb2R1bGVzL01ha2VmaWxlCTIwMTEtMDUtMjQgMDk6NDg6MDguMDAwMDAwMDAwICswMDAw CisrKyBzeXNsaW51eC0zLjgyL2NvbTMyL21vZHVsZXMvTWFrZWZpbGUJMjAxMS0wNS0yNCAwOTo1 MjozNC4xNTM0NjA2ODUgKzAwMDAKQEAgLTIxLDcgKzIxLDcgQEAKIE1PRFVMRVMJICA9IGNoYWlu LmMzMiBjb25maWcuYzMyIGV0aGVyc2VsLmMzMiBkbWl0ZXN0LmMzMiBjcHVpZHRlc3QuYzMyIFwK IAkgICAgcGNpdGVzdC5jMzIgZWxmLmMzMiBsaW51eC5jMzIgcmVib290LmMzMiBwbWxvYWQuYzMy IG1lbWluZm8uYzMyIFwKIAkgICAgc2RpLmMzMiBzYW5ib290LmMzMiBpZmNwdTY0LmMzMiB2ZXNh aW5mby5jMzIga2JkbWFwLmMzMiBjbWQuYzMyIFwKLQkgICAgdnBkdGVzdC5jMzIKKwkgICAgdnBk dGVzdC5jMzIgd2hpY2hzeXMuYzMyCiAKIFRFU1RGSUxFUyA9CiAKZGlmZiAtTmF1ciBzeXNsaW51 eC0zLjgyLW9yaWcvY29tMzIvbW9kdWxlcy93aGljaHN5cy5jIHN5c2xpbnV4LTMuODIvY29tMzIv bW9kdWxlcy93aGljaHN5cy5jCi0tLSBzeXNsaW51eC0zLjgyLW9yaWcvY29tMzIvbW9kdWxlcy93 aGljaHN5cy5jCTE5NzAtMDEtMDEgMDA6MDA6MDAuMDAwMDAwMDAwICswMDAwCisrKyBzeXNsaW51 eC0zLjgyL2NvbTMyL21vZHVsZXMvd2hpY2hzeXMuYwkyMDExLTA1LTI0IDA5OjUyOjE1LjIzNjAy MzMxMCArMDAwMApAQCAtMCwwICsxLDEyOSBAQAorLyogLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0gKgorICoKKyAq ICAgQ29weXJpZ2h0IDIwMTAgR2VydCBIdWxzZWxtYW5zIC0gQWxsIFJpZ2h0cyBSZXNlcnZlZAor ICoKKyAqICAgVGhpcyBwcm9ncmFtIGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmli dXRlIGl0IGFuZC9vciBtb2RpZnkKKyAqICAgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUg R2VuZXJhbCBQdWJsaWMgTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkKKyAqICAgdGhlIEZyZWUgU29m dHdhcmUgRm91bmRhdGlvbiwgSW5jLiwgNTEgRnJhbmtsaW4gU3QsIEZpZnRoIEZsb29yLAorICog ICBCb3N0b24gTUEgMDIxMTAtMTMwMSwgVVNBOyBlaXRoZXIgdmVyc2lvbiAyIG9mIHRoZSBMaWNl bnNlLCBvcgorICogICAoYXQgeW91ciBvcHRpb24pIGFueSBsYXRlciB2ZXJzaW9uOyBpbmNvcnBv cmF0ZWQgaGVyZWluIGJ5IHJlZmVyZW5jZS4KKyAqCisgKiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSAqLworCisv KgorICogd2hpY2hzeXMuYworICoKKyAqIERldGVtaW5lIHdoaWNoIGNvbW1hbmQgdG8gZXhlY3V0 ZSwgYmFzZWQgb24gdGhlIFN5c2xpbnV4IGJvb3Rsb2FkZXIgdmFyaWFudAorICogZnJvbSB3aGlj aCB5b3UgcnVuIGl0LgorICoKKyAqIFVzYWdlOiAgICB3aGljaHN5cy5jMzIgWy1pc28tIGNvbW1h bmRdIFstcHhlLSBjb21tYW5kXSBbLXN5cy0gY29tbWFuZF0KKyAqIEV4YW1wbGVzOiB3aGljaHN5 cy5jMzIgLWlzby0gY2hhaW4uYzMyIGhkMCAtc3lzLSBjaGFpbi5jMzIgaGQxIHN3YXAKKyAqICAg ICAgICAgICB3aGljaHN5cy5jMzIgLWlzby0gY29uZmlnIGlzby5jZmcgLXB4ZS0gY29uZmlnIHB4 ZS5jZmcKKyAqCisgKi8KKworI2luY2x1ZGUgPHN0ZGlvLmg+CisjaW5jbHVkZSA8c3RkYm9vbC5o PgorI2luY2x1ZGUgPGFsbG9jYS5oPgorI2luY2x1ZGUgPGNvbnNvbGUuaD4KKyNpbmNsdWRlIDxz dHJpbmcuaD4KKyNpbmNsdWRlIDxzeXNsaW51eC9ib290Lmg+CisjaW5jbHVkZSAic3lzbGludXgv Y29uZmlnLmgiCisKKworc3RhdGljIHN0cnVjdCBzeXNsaW51eF9wYXJhbWV0ZXIgeworICAgIGNo YXIgKiphcmdbMV07CisgICAgYm9vbCBvcHRpb247Cit9IGlzb2xpbnV4LCBweGVsaW51eCwgc3lz bGludXg7CisKKy8qIFhYWDogdGhpcyByZWFsbHkgc2hvdWxkIGJlIGxpYnJhcml6ZWQgKi8KK3N0 YXRpYyB2b2lkIGJvb3RfYXJncyhjaGFyICoqYXJncykKK3sKKyAgICBpbnQgbGVuID0gMCwgYSA9 IDA7CisgICAgY2hhciAqKnBwOworICAgIGNvbnN0IGNoYXIgKnA7CisgICAgY2hhciBjLCAqcSwg KnN0cjsKKworICAgIGZvciAocHAgPSBhcmdzOyAqcHA7IHBwKyspCisJbGVuICs9IHN0cmxlbigq cHApICsgMTsKKworICAgIHEgPSBzdHIgPSBhbGxvY2EobGVuKTsKKyAgICBmb3IgKHBwID0gYXJn czsgKnBwOyBwcCsrKSB7CisJcCA9ICpwcDsKKwl3aGlsZSAoKGMgPSAqcCsrKSkKKwkgICAgKnEr KyA9IGM7CisJKnErKyA9ICcgJzsKKwlhID0gMTsKKyAgICB9CisgICAgcSAtPSBhOworICAgICpx ID0gJ1wwJzsKKworICAgIGlmICghc3RyWzBdKQorCXN5c2xpbnV4X3J1bl9kZWZhdWx0KCk7Cisg ICAgZWxzZQorCXN5c2xpbnV4X3J1bl9jb21tYW5kKHN0cik7Cit9CisKK3N0YXRpYyB2b2lkIHVz YWdlKHZvaWQpCit7CisgICAgc3RhdGljIGNvbnN0IGNoYXIgdXNhZ2VbXSA9ICJcCitVc2FnZTog ICAgd2hpY2hzeXMuYzMyIFstaXNvLSBjb21tYW5kXSBbLXB4ZS0gY29tbWFuZF0gWy1zeXMtIGNv bW1hbmRdXG5cCitFeGFtcGxlczogd2hpY2hzeXMuYzMyIC1pc28tIGNoYWluLmMzMiBoZDAgLXN5 cy0gY2hhaW4uYzMyIGhkMSBzd2FwXG5cCisgICAgICAgICAgd2hpY2hzeXMuYzMyIC1pc28tIGNv bmZpZyBpc28uY2ZnIC1weGUtIGNvbmZpZyBweGUuY2ZnXG4iOworICAgIGZwcmludGYoc3RkZXJy LCB1c2FnZSk7Cit9CisKK2ludCBtYWluKGludCBhcmdjLCBjaGFyICphcmd2W10pCit7CisgICAg Y29uc3QgdW5pb24gc3lzbGludXhfZGVyaXZhdGl2ZV9pbmZvICpzZGk7CisKKyAgICBpbnQgYXJn ID0gMDsKKworICAgIG9wZW5jb25zb2xlKCZkZXZfbnVsbF9yLCAmZGV2X3N0ZGNvbl93KTsKKwor ICAgIC8qIElmIG5vIGFyZ3VtZW50IGdvdCBwYXNzZWQsIGxldCdzIHNob3cgdGhlIHVzYWdlICov CisgICAgaWYgKGFyZ2MgPT0gMSkgeworCSAgICB1c2FnZSgpOworCSAgICByZXR1cm4gMDsKKyAg ICB9CisKKyAgICBhcmcrKzsKKworICAgIHdoaWxlIChhcmcgPCBhcmdjKSB7CisJaWYgKCFzdHJj bXAoYXJndlthcmddLCAiLWlzby0iKSkgeworCSAgICBhcmd2W2FyZ10gPSBOVUxMOworCSAgICBp c29saW51eC5hcmdbMF0gPSAmYXJndlthcmcgKyAxXTsKKwkgICAgaXNvbGludXgub3B0aW9uID0g dHJ1ZTsKKwl9CisJaWYgKCFzdHJjbXAoYXJndlthcmddLCAiLXB4ZS0iKSkgeworCSAgICBhcmd2 W2FyZ10gPSBOVUxMOworCSAgICBweGVsaW51eC5hcmdbMF0gPSAmYXJndlthcmcgKyAxXTsKKwkg ICAgcHhlbGludXgub3B0aW9uID0gdHJ1ZTsKKwl9CisJaWYgKCFzdHJjbXAoYXJndlthcmddLCAi LXN5cy0iKSkgeworCSAgICBhcmd2W2FyZ10gPSBOVUxMOworCSAgICBzeXNsaW51eC5hcmdbMF0g PSAmYXJndlthcmcgKyAxXTsKKwkgICAgc3lzbGludXgub3B0aW9uID0gdHJ1ZTsKKwl9CisJYXJn Kys7CisgICAgfQorCisgICAgc2RpID0gc3lzbGludXhfZGVyaXZhdGl2ZV9pbmZvKCk7CisKKyAg ICBzd2l0Y2ggKHNkaS0+Yy5maWxlc3lzdGVtKSB7CisJY2FzZSBTWVNMSU5VWF9GU19JU09MSU5V WDoKKwkgICAgaXNvbGludXgub3B0aW9uID8gYm9vdF9hcmdzKGlzb2xpbnV4LmFyZ1swXSkgOiBm cHJpbnRmKHN0ZGVyciwgIk5vIGNvbW1hbmQgc3BlY2lmaWVkIGZvciBJU09MSU5VWC5cblxuIik7 IHVzYWdlKCk7CisJICAgIGJyZWFrOworCWNhc2UgU1lTTElOVVhfRlNfUFhFTElOVVg6CisJICAg IHB4ZWxpbnV4Lm9wdGlvbiA/IGJvb3RfYXJncyhweGVsaW51eC5hcmdbMF0pIDogZnByaW50Zihz dGRlcnIsICJObyBjb21tYW5kIHNwZWNpZmllZCBmb3IgUFhFTElOVVguXG5cbiIpOyB1c2FnZSgp OworCSAgICBicmVhazsKKwljYXNlIFNZU0xJTlVYX0ZTX1NZU0xJTlVYOgorCSAgICBzeXNsaW51 eC5vcHRpb24gPyBib290X2FyZ3Moc3lzbGludXguYXJnWzBdKSA6IGZwcmludGYoc3RkZXJyLCAi Tm8gY29tbWFuZCBzcGVjaWZpZWQgZm9yIFNZU0xJTlVYLlxuXG4iKTsgdXNhZ2UoKTsKKwkgICAg YnJlYWs7CisJY2FzZSBTWVNMSU5VWF9GU19VTktOT1dOOgorCWRlZmF1bHQ6CisJICAgIGZwcmlu dGYoc3RkZXJyLCAiVW5rbm93biBTeXNsaW51eCBmaWxlc3lzdGVtXG5cbiIpOworICAgIH0KKwor ICAgIHJldHVybiAtMTsKK30K