From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [216.168.135.167] (helo=sanddollar.geekisp.com) by linuxtogo.org with esmtp (Exim 4.69) (envelope-from ) id 1MGxI1-0008WN-Rd for openembedded-devel@openembedded.org; Wed, 17 Jun 2009 17:43:06 +0200 Received: (qmail 5557 invoked by uid 1003); 17 Jun 2009 15:32:37 -0000 Received: from localhost (HELO localhost.localdomain) (philip@opensdr.com@127.0.0.1) by mail.geekisp.com with SMTP; 17 Jun 2009 15:32:36 -0000 Message-ID: <4A390C93.7090404@balister.org> Date: Wed, 17 Jun 2009 11:32:35 -0400 From: Philip Balister User-Agent: Thunderbird 2.0.0.14 (X11/20080501) MIME-Version: 1.0 To: openembedded-devel@lists.openembedded.org References: <1245240653-436-1-git-send-email-marcin@juszkiewicz.com.pl> <1245242573-5006-1-git-send-email-marcin@juszkiewicz.com.pl> In-Reply-To: Subject: Re: [STABLE][PATCH] fix for MACHINE_KERNEL_PR stuff X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jun 2009 15:43:06 -0000 X-Groupsio-MsgNum: 11326 Content-Type: multipart/signed; protocol="application/x-pkcs7-signature"; micalg=sha1; boundary="------------ms050403080609020505030901" --------------ms050403080609020505030901 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Acked-by: Philip Balister Koen Kooi wrote: > On 17-06-09 14:42, Marcin Juszkiewicz wrote: >> This patch unbreaks current behaviour which was introduced by >> MACHINE_KERNEL_PR variable. >> >> As most of target machines do not use it they have PR with broken value >> (set to "r0" instead of value in recipe). I took other way which makes >> both types of users happy -- those with MACHINE_KERNEL_PR in use and >> those without it. >> >> By default we set M_K_PR to empty string instead of "r0" - this allows >> to check is it set at all or not. If it is set then we set PR to this >> value. >> Otherwise we ignore existance of that variable and use PR from recipe. >> >> Signed-off-by: Marcin Juszkiewicz > > Acked-by: Koen Kooi > > >> --- >> classes/kernel.bbclass | 9 +++++---- >> conf/bitbake.conf | 2 +- >> 2 files changed, 6 insertions(+), 5 deletions(-) >> >> diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass >> index 954c407..278aec1 100644 >> --- a/classes/kernel.bbclass >> +++ b/classes/kernel.bbclass >> @@ -20,6 +20,11 @@ python __anonymous () { >> image = bb.data.getVar('INITRAMFS_IMAGE', d, True) >> if image != '' and image is not None: >> bb.data.setVar('INITRAMFS_TASK', >> '${INITRAMFS_IMAGE}:do_rootfs', d) >> + >> + machine_kernel_pr = bb.data.getVar('MACHINE_KERNEL_PR', d, True) >> + >> + if machine_kernel_pr: >> + bb.data.setVar('PR', machine_kernel_pr, d) >> } >> >> INITRAMFS_IMAGE ?= "" >> @@ -64,10 +69,6 @@ export CMDLINE_CONSOLE = >> "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "tt >> KERNEL_VERSION = "${@get_kernelversion('${S}')}" >> KERNEL_MAJOR_VERSION = >> "${@get_kernelmajorversion('${KERNEL_VERSION}')}" >> >> -# A machine.conf or local.conf can increase MACHINE_KERNEL_PR to force >> -# rebuilds for kernel and external modules >> -PR = "${MACHINE_KERNEL_PR}" >> - >> KERNEL_LOCALVERSION ?= "" >> >> # kernels are generally machine specific >> diff --git a/conf/bitbake.conf b/conf/bitbake.conf >> index c411b95..9333b4e 100644 >> --- a/conf/bitbake.conf >> +++ b/conf/bitbake.conf >> @@ -159,7 +159,7 @@ P = "${PN}-${PV}" >> >> # Define a PR for kernels that machines can override so things like >> # modules get rebuilt >> -MACHINE_KERNEL_PR ?= "r0" >> +MACHINE_KERNEL_PR = "" >> >> # Base package name >> # Automatically derives "foo" from "foo-native", "foo-cross" or >> "foo-initial" > > > > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel > --------------ms050403080609020505030901 Content-Type: application/x-pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIJRTCCAv0w ggJmoAMCAQICECwlen/oUcoDd1VrNqKp/fwwDQYJKoZIhvcNAQEFBQAwYjELMAkGA1UEBhMCWkEx JTAjBgNVBAoTHFRoYXd0ZSBDb25zdWx0aW5nIChQdHkpIEx0ZC4xLDAqBgNVBAMTI1RoYXd0ZSBQ ZXJzb25hbCBGcmVlbWFpbCBJc3N1aW5nIENBMB4XDTA5MDQxNTAwNDQ1OFoXDTEwMDQxNTAwNDQ1 OFowYjERMA8GA1UEBBMIQmFsaXN0ZXIxDzANBgNVBCoTBlBoaWxpcDEYMBYGA1UEAxMPUGhpbGlw IEJhbGlzdGVyMSIwIAYJKoZIhvcNAQkBFhNwaGlsaXBAYmFsaXN0ZXIub3JnMIIBIjANBgkqhkiG 9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx5Xoie8CV9dJeiaiKRdylvicHE9Aha6f9/CLlVs+Ezob7fIu Ra4P9ugzZZ2VCtPMQU3Qsjw35mVmYaKXB1U+fZeffbyad6OJEIK1jhqBIz5jtJMc/YWXn/bRmqCl MfTCgilUMOcsfiHAbmLVhYiNbEhOuy6vWdxSSolHqVa/IHE72qqjhoYWHd+5XVfx1c4jW+CePNMQ EHxjCzuD+wq6Mzle72dXw+bnyIpG99hB26uNmV//h5iz1VmJU63FZWynSjG79NcY9+mTWXeX213V V6kJ2wce2rETbYvKQ7err6NnZnG/tiwGI1M7fQqQAti+CkDciLJ129LO+APVYZQgEwIDAQABozAw LjAeBgNVHREEFzAVgRNwaGlsaXBAYmFsaXN0ZXIub3JnMAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcN AQEFBQADgYEAIUyDAPIEniN6SUdbDiBqi2dtITdnkoUItm/tX9TRn66P0VtWug7k7xjo6piWRE7B ZwhihotNY0ZnjlK+h0VorxfY63B5tarRB6qJ7f26ukmpltwWWLDB2hWFoKUCn6PE2NTdj+1xNinh ZNQHy4GyygXjlVfVSn/ZnaGJ31z4PK0wggL9MIICZqADAgECAhAsJXp/6FHKA3dVazaiqf38MA0G CSqGSIb3DQEBBQUAMGIxCzAJBgNVBAYTAlpBMSUwIwYDVQQKExxUaGF3dGUgQ29uc3VsdGluZyAo UHR5KSBMdGQuMSwwKgYDVQQDEyNUaGF3dGUgUGVyc29uYWwgRnJlZW1haWwgSXNzdWluZyBDQTAe Fw0wOTA0MTUwMDQ0NThaFw0xMDA0MTUwMDQ0NThaMGIxETAPBgNVBAQTCEJhbGlzdGVyMQ8wDQYD VQQqEwZQaGlsaXAxGDAWBgNVBAMTD1BoaWxpcCBCYWxpc3RlcjEiMCAGCSqGSIb3DQEJARYTcGhp bGlwQGJhbGlzdGVyLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMeV6InvAlfX SXomoikXcpb4nBxPQIWun/fwi5VbPhM6G+3yLkWuD/boM2WdlQrTzEFN0LI8N+ZlZmGilwdVPn2X n328mnejiRCCtY4agSM+Y7STHP2Fl5/20ZqgpTH0woIpVDDnLH4hwG5i1YWIjWxITrsur1ncUkqJ R6lWvyBxO9qqo4aGFh3fuV1X8dXOI1vgnjzTEBB8Yws7g/sKujM5Xu9nV8Pm58iKRvfYQdurjZlf /4eYs9VZiVOtxWVsp0oxu/TXGPfpk1l3l9td1VepCdsHHtqxE22LykO3q6+jZ2Zxv7YsBiNTO30K kALYvgpA3IiyddvSzvgD1WGUIBMCAwEAAaMwMC4wHgYDVR0RBBcwFYETcGhpbGlwQGJhbGlzdGVy Lm9yZzAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBBQUAA4GBACFMgwDyBJ4jeklHWw4gaotnbSE3 Z5KFCLZv7V/U0Z+uj9FbVroO5O8Y6OqYlkROwWcIYoaLTWNGZ45SvodFaK8X2OtwebWq0Qeqie39 urpJqZbcFliwwdoVhaClAp+jxNjU3Y/tcTYp4WTUB8uBssoF45VX1Up/2Z2hid9c+DytMIIDPzCC AqigAwIBAgIBDTANBgkqhkiG9w0BAQUFADCB0TELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rl cm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMRowGAYDVQQKExFUaGF3dGUgQ29uc3VsdGluZzEo MCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEkMCIGA1UEAxMbVGhhd3Rl IFBlcnNvbmFsIEZyZWVtYWlsIENBMSswKQYJKoZIhvcNAQkBFhxwZXJzb25hbC1mcmVlbWFpbEB0 aGF3dGUuY29tMB4XDTAzMDcxNzAwMDAwMFoXDTEzMDcxNjIzNTk1OVowYjELMAkGA1UEBhMCWkEx JTAjBgNVBAoTHFRoYXd0ZSBDb25zdWx0aW5nIChQdHkpIEx0ZC4xLDAqBgNVBAMTI1RoYXd0ZSBQ ZXJzb25hbCBGcmVlbWFpbCBJc3N1aW5nIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDE pjxVc1X7TrnKmVoeaMB1BHCd3+n/ox7svc31W/Iadr1/DDph8r9RzgHU5VAKMNcCY1osiRVwjt3J 8CuFWqo/cVbLrzwLB+fxH5E2JCoTzyvV84J3PQO+K/67GD4Hv0CAAmTXp6a7n2XRxSpUhQ9IBH+n ttE8YQRAHmQZcmC3+wIDAQABo4GUMIGRMBIGA1UdEwEB/wQIMAYBAf8CAQAwQwYDVR0fBDwwOjA4 oDagNIYyaHR0cDovL2NybC50aGF3dGUuY29tL1RoYXd0ZVBlcnNvbmFsRnJlZW1haWxDQS5jcmww CwYDVR0PBAQDAgEGMCkGA1UdEQQiMCCkHjAcMRowGAYDVQQDExFQcml2YXRlTGFiZWwyLTEzODAN BgkqhkiG9w0BAQUFAAOBgQBIjNFQg+oLLswNo2asZw9/r6y+whehQ5aUnX9MIbj4Nh+qLZ82L8D0 HFAgk3A8/a3hYWLD2ToZfoSxmRsAxRoLgnSeJVCUYsfbJ3FXJY3dqZw5jowgT2Vfldr394fWxghO rvbqNOUQGls1TXfjViF4gtwhGTXeJLHTHUb/XV9lTzGCA2QwggNgAgEBMHYwYjELMAkGA1UEBhMC WkExJTAjBgNVBAoTHFRoYXd0ZSBDb25zdWx0aW5nIChQdHkpIEx0ZC4xLDAqBgNVBAMTI1RoYXd0 ZSBQZXJzb25hbCBGcmVlbWFpbCBJc3N1aW5nIENBAhAsJXp/6FHKA3dVazaiqf38MAkGBSsOAwIa BQCgggHDMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTA5MDYxNzE1 MzIzNVowIwYJKoZIhvcNAQkEMRYEFFWWSEG427plnCt19PT5ESQVWFnJMFIGCSqGSIb3DQEJDzFF MEMwCgYIKoZIhvcNAwcwDgYIKoZIhvcNAwICAgCAMA0GCCqGSIb3DQMCAgFAMAcGBSsOAwIHMA0G CCqGSIb3DQMCAgEoMIGFBgkrBgEEAYI3EAQxeDB2MGIxCzAJBgNVBAYTAlpBMSUwIwYDVQQKExxU aGF3dGUgQ29uc3VsdGluZyAoUHR5KSBMdGQuMSwwKgYDVQQDEyNUaGF3dGUgUGVyc29uYWwgRnJl ZW1haWwgSXNzdWluZyBDQQIQLCV6f+hRygN3VWs2oqn9/DCBhwYLKoZIhvcNAQkQAgsxeKB2MGIx CzAJBgNVBAYTAlpBMSUwIwYDVQQKExxUaGF3dGUgQ29uc3VsdGluZyAoUHR5KSBMdGQuMSwwKgYD VQQDEyNUaGF3dGUgUGVyc29uYWwgRnJlZW1haWwgSXNzdWluZyBDQQIQLCV6f+hRygN3VWs2oqn9 /DANBgkqhkiG9w0BAQEFAASCAQCeLEVXk4MqQtrw8QfjITwdG5Bx/3ExlzGoNzr1jC4fDMX35l9n wkcK1mxStaUboMOXNtKd19atrrIqq+tX7GfIdHKL/sLEYuywSap/3d4xbxf5V9p21UIVwGAzSHSj c8MJti/mA3/3wJ5ue9B6djDwOiK9aNRRIyKbunlxhdlNyf4LiFJ6AtCNlFhdyssiteCrHVrDWXsN QU+7q6QMVaCQD7vidxSWX9k1JoXnpMhMOJGKcSgGnrXvPsWN6mSIdWJfwckcDYVmsB9D1OB05p6t CDIwQu+Qw7P286d+5YsqMQMYDl3R7nalrt9oTEiXUY2eH0CEm0HCSU50dny9FrHgAAAAAAAA --------------ms050403080609020505030901--