7409 2005-07-20 18:42:35 +0400 find-requires for %pre/%preun/%post/%postun scriplets 2008-02-26 00:20:18 +0300 1 1 4 Development Sisyphus rpm-build unstable all Linux CLOSED FIXED P2 normal --- 2603 1 at placeholder arseny evg glebfm ildar imz ldv placeholder vt qa-sisyphus oldest_to_newest 27491 0 at 2005-07-20 18:42:35 +0400 Here is my attempt to implement dependency tracking for rpm %pre/%post scripts. The idea is that we can save script contents under %buildroot and process it just as usual file. We then tap into generateDepends() to do the rest of the work. 27493 1 1009 at 2005-07-20 18:44:20 +0400 Created attachment 1009 patch for build/files.c The patch is not tested thoroughly, but known to work in a few simple cases. 30036 2 ldv 2005-09-05 00:23:23 +0400 Interesting. Do we need this dependency tracker to be enabled by default? Right now we have no way to control such tracker. 30040 3 ldv 2005-09-05 00:40:56 +0400 *** Bug 4397 has been marked as a duplicate of this bug. *** 61866 4 at 2008-01-24 22:26:00 +0300 Я в этом патче делал так что просто временный файл со скриптом подаётся на вход find-requires (вместе с остальными файлами из payload). Так что это может управляться через те же ручки, что и зависимости в файлах подпакета (AutoReq, AutoProv). Это наверное неправильно. 61870 5 at 2008-01-24 23:35:09 +0300 Ой, кажется я неправильно написал что скрипт вместе с payload обрабатывался. 64601 6 ldv 2008-02-25 23:14:07 +0300 implemented in 4.0.4-alt87 1009 2005-07-20 18:44:20 +0400 2005-07-20 18:44:20 +0400 patch for build/files.c rpm-4.0-alt-script-findreq.patch text/plain 5721 at LS0tIHJwbS00XzAtNC4wLjQvYnVpbGQvZmlsZXMuYy0JMjAwNC0wMS0yNyAxMzo1MzozOCArMDMw MAorKysgcnBtLTRfMC00LjAuNC9idWlsZC9maWxlcy5jCTIwMDUtMDctMjAgMTg6MDA6MDAgKzA0 MDAKQEAgLTI0NjgsNiArMjQ2OCw4OSBAQCBEZXBNc2dfdCBkZXBNc2dzW10gPSB7CiB9OwogLypA PWV4cG9ydGxvY2FsID1leHBvcnRoZWFkZXJ2YXJAKi8KIAordHlwZWRlZiBzdHJ1Y3QgeworCWNo YXIgKnNjcmlwdG5hbWU7CisJaW50IHByb2dUYWc7CisJaW50IHNjcmlwdFRhZzsKK30gU2NyaXB0 RGVwX3Q7CisKK1NjcmlwdERlcF90IHNjcmlwdERlcHNbXSA9IHsKKwl7ICJwcmUiLAlSUE1UQUdf UFJFSU5QUk9HLCBSUE1UQUdfUFJFSU4gfSwKKwl7ICJwcmV1biIsCVJQTVRBR19QUkVVTlBST0cs IFJQTVRBR19QUkVVTiB9LAorCXsgInBvc3QiLAlSUE1UQUdfUE9TVElOUFJPRywgUlBNVEFHX1BP U1RJTiB9LAorCXsgInBvc3R1biIsCVJQTVRBR19QT1NUVU5QUk9HLCBSUE1UQUdfUE9TVFVOIH0s CisJeyBOVUxMLAkJMCwgMCB9Cit9OworCQorc3RhdGljIGNoYXIgKnNhdmVJbnN0U2NyaXB0KFNw ZWMgc3BlYywgUGFja2FnZSBwa2csIGNvbnN0IGNoYXIgKnNjcmlwdG5hbWUpCit7CisJU2NyaXB0 RGVwX3QgKnNkOworCWludCBwcm9nVGFnID0gMCwgc2NyaXB0VGFnID0gMDsKKwkKKwlmb3IgKHNk ID0gc2NyaXB0RGVwczsgc2QtPnNjcmlwdG5hbWU7IHNkKyspCisJCWlmIChzdHJjbXAoc2NyaXB0 bmFtZSwgc2QtPnNjcmlwdG5hbWUpID09IDApIHsKKwkJCXByb2dUYWcgPSBzZC0+cHJvZ1RhZzsK KwkJCXNjcmlwdFRhZyA9IHNkLT5zY3JpcHRUYWc7CisJCQlicmVhazsKKwkJfQorCWlmICghc2Ny aXB0VGFnKQorCQlyZXR1cm4gTlVMTDsKKworCS8qIHNpbWlsYXIgdG8gcnVuSW5zdFNjcmlwdCgp ICovCisJcnBtVGFnVHlwZSBzdHQ7CisJY2hhciAqc2NyaXB0ID0gTlVMTDsKKwlIR0VfdCBoZ2Ug PSAoSEdFX3QpaGVhZGVyR2V0RW50cnlNaW5NZW1vcnk7CisKKwloZ2UocGtnLT5oZWFkZXIsIHNj cmlwdFRhZywgJnN0dCwgJnNjcmlwdCwgTlVMTCk7CisJaWYgKCFzY3JpcHQpCisJCXJldHVybiBO VUxMOworCisJcnBtVGFnVHlwZSBwdHQ7CisJaW50IGFyZ2M7CisJY29uc3QgY2hhciAqKmFyZ3Yg PSBOVUxMOworCWNvbnN0IGNoYXIgKmFyZ3YxWzFdOworCisJaGdlKHBrZy0+aGVhZGVyLCBwcm9n VGFnLCAmcHR0LCAmYXJndiwgJmFyZ2MpOworCWlmIChhcmd2ICYmIHB0dCA9PSBSUE1fU1RSSU5H X1RZUEUpIHsKKwkJYXJndjFbMF0gPSAoY29uc3QgY2hhciAqKSBhcmd2OworCQlhcmd2ID0gYXJn djE7CisJCWFyZ2MgPSAxOworCX0KKwlpZiAoIWFyZ3YpIHsKKwkJYXJndjFbMF0gPSAiL2Jpbi9z aCI7CisJCWFyZ3YgPSBhcmd2MTsKKwkJYXJnYyA9IDE7CisJfQorCisJY2hhciAqcGF0aCA9IHJw bUdlblBhdGgoc3BlYy0+YnVpbGRSb290VVJMLCAiLnNjcmlwdC5YWFhYWFgiLCBOVUxMKTsKKwlp bnQgZmQgPSBta3N0ZW1wKHBhdGgpOworCWlmIChmZCA8IDApIHsKKwkJcGVycm9yKCJta3N0ZW1w Iik7CisJCWV4aXQoMSk7CisJfQorCQorCWZjaG1vZChmZCwgMDc1NSk7CisKKwlGSUxFICpmID0g ZmRvcGVuKGZkLCAidyIpOworCWlmICghZikgeworCQlwZXJyb3IoImZkb3BlbiIpOworCQlleGl0 KDEpOworCX0KKwkJCQorCWZwcmludGYoZiwgIiMhJXMiLCBhcmd2WzBdKTsKKwl3aGlsZSAoLS1h cmdjID4gMCkKKwkJZnByaW50ZihmLCAiICVzIiwgKisrYXJndik7CisJZnByaW50ZihmLCAiXG4l c1xuIiwgc2NyaXB0KTsKKwlmY2xvc2UoZik7CisKKyNpZiAwCisJY2hhciAqY21kOworCWFzcHJp bnRmKCZjbWQsICJzZXQgLXg7IGNhdCAlcyIsIHBhdGgpOworCXN5c3RlbShjbWQpOworI2VuZGlm CisJcmV0dXJuIHBhdGg7Cit9CisKIC8qKgogICovCiBzdGF0aWMgaW50IGdlbmVyYXRlRGVwZW5k cyhTcGVjIHNwZWMsIFBhY2thZ2UgcGtnLCBURklfdCBjcGlvTGlzdCwgaW50IG11bHRpTGliKQpA QCAtMjQ3Nyw4ICsyNTYwLDYgQEAgc3RhdGljIGludCBnZW5lcmF0ZURlcGVuZHMoU3BlYyBzcGVj LCBQYQogCQlmaWxlU3lzdGVtLCBpbnRlcm5hbFN0YXRlIEAqLwogewogICAgIFRGSV90IGZpID0g Y3Bpb0xpc3Q7Ci0gICAgU3RyaW5nQnVmIHdyaXRlQnVmOwotICAgIGludCB3cml0ZUJ5dGVzOwog ICAgIFN0cmluZ0J1ZiByZWFkQnVmOwogICAgIERlcE1zZ190ICpkbTsKICAgICBpbnQgZmFpbG5v bnplcm8gPSAxOwpAQCAtMjQ5Nyw5ICsyNTc4LDYgQEAgc3RhdGljIGludCBnZW5lcmF0ZURlcGVu ZHMoU3BlYyBzcGVjLCBQYQogICAgIGNvbnN0IGNoYXIJKm1Qb3N0ID0gIiV7X19zcGVjX2F1dG9k ZXBfcG9zdH0iOwogICAgIHVybGluZm8JdSA9IE5VTEw7CiAKLSAgICBpZiAoIShmaSAmJiBmaS0+ ZmMgPiAwKSkKLQlyZXR1cm4gMDsKLQogICAgIGlmICggISpwa2ctPmF1dG9SZXEgJiYgISpwa2ct PmF1dG9Qcm92ICkKIAlyZXR1cm4gMDsKICAgICAKQEAgLTI1MzYsMTkgKzI2MTQsMjQgQEAgc3Rh dGljIGludCBnZW5lcmF0ZURlcGVuZHMoU3BlYyBzcGVjLCBQYQogCXJ1blRlbXBsYXRlID0gcnBt RXhwYW5kKG1UZW1wbGF0ZSwgTlVMTCk7CiAJcnVuUG9zdCA9IHJwbUV4cGFuZChtUG9zdCwgTlVM TCk7CiAKLSAgICB3cml0ZUJ1ZiA9IG5ld1N0cmluZ0J1ZigpOwotICAgIGZvciAoaSA9IDAsIHdy aXRlQnl0ZXMgPSAwOyBpIDwgZmktPmZjOyBpKyspIHsKKyAgICBTdHJpbmdCdWYgZmlsZUxpc3RC dWYgPSBOVUxMOworICAgIGludCBmaWxlTGlzdEJ5dGVzID0gMDsKIAotCWlmIChmaS0+Zm1hcGZs YWdzICYmIG11bHRpTGliID09IDIpIHsKLQkgICAgaWYgKCEoZmktPmZtYXBmbGFnc1tpXSAmIENQ SU9fTVVMVElMSUIpKQotCQljb250aW51ZTsKLQkgICAgZmktPmZtYXBmbGFnc1tpXSAmPSB+Q1BJ T19NVUxUSUxJQjsKLQl9Ci0KLQlhcHBlbmRTdHJpbmdCdWYod3JpdGVCdWYsIGZpLT5kbmxbZmkt PmRpbFtpXV0pOwotCXdyaXRlQnl0ZXMgKz0gc3RybGVuKGZpLT5kbmxbZmktPmRpbFtpXV0pOwot CWFwcGVuZExpbmVTdHJpbmdCdWYod3JpdGVCdWYsIGZpLT5ibmxbaV0pOwotCXdyaXRlQnl0ZXMg Kz0gc3RybGVuKGZpLT5ibmxbaV0pICsgMTsKKyAgICBpZiAoZmkgJiYgZmktPmZjID4gMCkgewor ICAgICAgZmlsZUxpc3RCdWYgPSBuZXdTdHJpbmdCdWYoKTsKKyAgICAgIGZvciAoaSA9IDAsIGZp bGVMaXN0Qnl0ZXMgPSAwOyBpIDwgZmktPmZjOyBpKyspIHsKKyAgCisgIAlpZiAoZmktPmZtYXBm bGFncyAmJiBtdWx0aUxpYiA9PSAyKSB7CisgIAkgICAgaWYgKCEoZmktPmZtYXBmbGFnc1tpXSAm IENQSU9fTVVMVElMSUIpKQorICAJCWNvbnRpbnVlOworICAJICAgIGZpLT5mbWFwZmxhZ3NbaV0g Jj0gfkNQSU9fTVVMVElMSUI7CisgIAl9CisgIAorICAJYXBwZW5kU3RyaW5nQnVmKGZpbGVMaXN0 QnVmLCBmaS0+ZG5sW2ZpLT5kaWxbaV1dKTsKKyAgCWZpbGVMaXN0Qnl0ZXMgKz0gc3RybGVuKGZp LT5kbmxbZmktPmRpbFtpXV0pOworICAJYXBwZW5kTGluZVN0cmluZ0J1ZihmaWxlTGlzdEJ1Ziwg ZmktPmJubFtpXSk7CisgIAlmaWxlTGlzdEJ5dGVzICs9IHN0cmxlbihmaS0+Ym5sW2ldKSArIDE7 CisgICAgICB9CiAgICAgfQogCiAgICAgZm9yIChkbSA9IGRlcE1zZ3M7IGRtLT5tc2cgIT0gTlVM TDsgZG0rKykgewpAQCAtMjU2MCwyNiArMjY0Myw1MiBAQCBzdGF0aWMgaW50IGdlbmVyYXRlRGVw ZW5kcyhTcGVjIHNwZWMsIFBhCiAJRklMRSAqZnAgPSAwOwogCWNoYXIgKnJ1bkJvZHkgPSAwOwog Ci0JaWYgKCAhZG0tPmFyZ3YgfHwgIWRtLT5hcmd2WzBdICkKKwljaGFyICppbnN0U2NyaXB0ID0g TlVMTDsKKworCWlmICghZG0tPmFyZ3ZbMF0gJiYgZG0tPmFyZ3ZbMV0pCisJCWluc3RTY3JpcHQg PSBzYXZlSW5zdFNjcmlwdChzcGVjLCBwa2csIGRtLT5hcmd2WzFdKTsKKworCWlmICghZG0tPmFy Z3ZbMF0gJiYgIWluc3RTY3JpcHQpCisJCWNvbnRpbnVlOworCisJY2hhciAqd3JpdGVCdWY7CisJ aW50IHdyaXRlQnl0ZXM7CisKKwlpZiAoaW5zdFNjcmlwdCkgeworCQl3cml0ZUJ1ZiA9IG5ld1N0 cmluZ0J1ZigpOworCQlhcHBlbmRMaW5lU3RyaW5nQnVmKHdyaXRlQnVmLCBpbnN0U2NyaXB0KTsK KwkJd3JpdGVCeXRlcyA9IHN0cmxlbihpbnN0U2NyaXB0KSArIDE7CisJfSBlbHNlIHsKKwkJd3Jp dGVCdWYgPSBmaWxlTGlzdEJ1ZjsKKwkJd3JpdGVCeXRlcyA9IGZpbGVMaXN0Qnl0ZXM7CisJfQor CisJaWYgKCF3cml0ZUJ1ZikKIAkJY29udGludWU7CiAKKwlpZiAoaW5zdFNjcmlwdCkgLyogc2lt aWxhciB0byBwYXJzZVNjcmlwdCgpICovCisJCXRhZ2ZsYWdzID0gZG0tPm1hc2sgfCBSUE1TRU5T RV9QUkVSRVE7CisKIAlzd2l0Y2godGFnKSB7CiAJY2FzZSBSUE1UQUdfUFJPVklERUZMQUdTOgog CSAgICBpZiAoISpwa2ctPmF1dG9Qcm92KQogCQljb250aW51ZTsKLQkgICAgdGFnZmxhZ3MgPSBS UE1TRU5TRV9GSU5EX1BST1ZJREVTOworCSAgICB0YWdmbGFncyB8PSBSUE1TRU5TRV9GSU5EX1BS T1ZJREVTOwogCSAgICAvKkBzd2l0Y2hicmVha0AqLyBicmVhazsKIAljYXNlIFJQTVRBR19SRVFV SVJFRkxBR1M6CiAJICAgIGlmICghKnBrZy0+YXV0b1JlcSkKIAkJY29udGludWU7Ci0JICAgIHRh Z2ZsYWdzID0gUlBNU0VOU0VfRklORF9SRVFVSVJFUzsKKwkgICAgdGFnZmxhZ3MgfD0gUlBNU0VO U0VfRklORF9SRVFVSVJFUzsKIAkgICAgLypAc3dpdGNoYnJlYWtAKi8gYnJlYWs7CiAJZGVmYXVs dDoKIAkgICAgY29udGludWU7CiAJICAgIC8qQG5vdHJlYWNoZWRAKi8gLypAc3dpdGNoYnJlYWtA Ki8gYnJlYWs7CiAJfQogCi0JcnVuQm9keSA9IHJwbUV4cGFuZCggZG0tPmFyZ3ZbMF0sIE5VTEwg KTsKKwlpZiAoaW5zdFNjcmlwdCkKKwkJcnVuQm9keSA9IHJwbUV4cGFuZCggIiV7X19maW5kX3Jl cXVpcmVzfSIsIE5VTEwpOworCWVsc2UKKwkJcnVuQm9keSA9IHJwbUV4cGFuZCggZG0tPmFyZ3Zb MF0sIE5VTEwgKTsKIAogCWlmICggIXJ1bkJvZHkgfHwgJyUnID09IHJ1bkJvZHlbMF0gKQogCXsK QEAgLTI1ODcsNyArMjY5Niw3IEBAIHN0YXRpYyBpbnQgZ2VuZXJhdGVEZXBlbmRzKFNwZWMgc3Bl YywgUGEKIAkJY29udGludWU7CiAJfQogCi0JeworCWlmICghaW5zdFNjcmlwdCkgewogCQljb25z dCBjaGFyICoqYXY7CiAJCWZvciAoIGF2ID0gZG0tPmFyZ3YgKyAxOyBhdlswXTsgKythdiApCiAJ CXsKQEAgLTI2OTAsNiArMjc5OSwxMyBAQCBzdGF0aWMgaW50IGdlbmVyYXRlRGVwZW5kcyhTcGVj IHNwZWMsIFBhCiAKIAlVbmxpbmsoc2NyaXB0TmFtZSk7CiAJc2NyaXB0TmFtZSA9IF9mcmVlKHNj cmlwdE5hbWUpOworCisJaWYgKGluc3RTY3JpcHQpIHsKKwkJdW5saW5rKGluc3RTY3JpcHQpOwor CQlfZnJlZShpbnN0U2NyaXB0KTsKKwkJX2ZyZWUod3JpdGVCdWYpOworCX0KKwogICAgIH0KIAog CWlmICh1KSB7CkBAIC0yNzA4LDcgKzI4MjQsOCBAQCBzdGF0aWMgaW50IGdlbmVyYXRlRGVwZW5k cyhTcGVjIHNwZWMsIFBhCiAgICAgcnVuUG9zdCA9IF9mcmVlKHJ1blBvc3QpOwogICAgIHJ1blRl bXBsYXRlID0gX2ZyZWUocnVuVGVtcGxhdGUpOwogICAgIHJ1bkRpclVSTCA9IF9mcmVlKHJ1bkRp clVSTCk7Ci0gICAgd3JpdGVCdWYgPSBmcmVlU3RyaW5nQnVmKHdyaXRlQnVmKTsKKyAgICBpZiAo ZmlsZUxpc3RCdWYpCisJZmlsZUxpc3RCdWYgPSBmcmVlU3RyaW5nQnVmKGZpbGVMaXN0QnVmKTsK ICAgICByZXR1cm4gcmM7CiB9CiAK