{"id":3782,"url":"https://patchwork.libcamera.org/api/patches/3782/?format=json","web_url":"https://patchwork.libcamera.org/patch/3782/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200512162822.21324-1-laurent.pinchart@ideasonboard.com>","date":"2020-05-12T16:28:22","name":"[libcamera-devel] ipa: Only sign IPA modules that are being installed","commit_ref":"924778eb073c47a0defc7319e98029c712129ede","pull_url":null,"state":"accepted","archived":false,"hash":"0a92af8d8551b318597a4cb734aa3ad0600250f8","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/3782/mbox/","series":[{"id":900,"url":"https://patchwork.libcamera.org/api/series/900/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=900","date":"2020-05-12T16:28:22","name":"[libcamera-devel] ipa: Only sign IPA modules that are being installed","version":1,"mbox":"https://patchwork.libcamera.org/series/900/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3782/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3782/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4E366603E0\n\tfor ;\n\tTue, 12 May 2020 18:28:32 +0200 (CEST)","from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A445D51F;\n\tTue, 12 May 2020 18:28:31 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"E6Q2JNRh\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1589300911;\n\tbh=jZUmtwmTpC2BajTXgKvB1uhU5+vzbTo3N3x7Vhg54D4=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=E6Q2JNRht3/BkLn7km18TijbScOYsXp4QfFkFXWT/xMMQnZ1SssZHetGhWErcRZze\n\t3WlmqzpFSyK8LcRFt2lwiqNVBXuv7XohT0bwtf+TojUCyWXc1UUkSJHDJlPAPdr6vB\n\tNIrUG+sjTv0dNL4OILUKnEY1uOB9QY7CIdn0c1oM=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Cc":"Tomasz Figa ","Date":"Tue, 12 May 2020 19:28:22 +0300","Message-Id":"<20200512162822.21324-1-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.26.2","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH] ipa: Only sign IPA modules that are being\n\tinstalled","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Tue, 12 May 2020 16:28:32 -0000"},"content":"The ipa-sign-install.sh script, run when installing libcamera, signs all\nIPA modules present in the module directory. This would result in\nthird-party modules being signed if any are present in the directory.\nFix it by explicitly passing the list of IPA modules to the\nipa-sign-install.sh script.\n\nSigned-off-by: Laurent Pinchart \n---\n src/ipa/ipa-sign-install.sh | 12 ++++++++----\n src/ipa/meson.build | 6 ++++--\n 2 files changed, 12 insertions(+), 6 deletions(-)","diff":"diff --git a/src/ipa/ipa-sign-install.sh b/src/ipa/ipa-sign-install.sh\nindex 5317a8a2042b..bcedb8b5cdd1 100755\n--- a/src/ipa/ipa-sign-install.sh\n+++ b/src/ipa/ipa-sign-install.sh\n@@ -6,13 +6,17 @@\n #\n # ipa-sign-install.sh - Regenerate IPA module signatures when installing\n \n-libdir=$1\n-key=$2\n+key=$1\n+shift\n+modules=$*\n \n ipa_sign=$(dirname \"$0\")/ipa-sign.sh\n \n echo \"Regenerating IPA modules signatures\"\n \n-for module in \"${MESON_INSTALL_DESTDIR_PREFIX}/${libdir}\"/*.so ; do\n-\t\"${ipa_sign}\" \"${key}\" \"${module}\" \"${module}.sign\"\n+for module in ${modules} ; do\n+\tmodule=\"${MESON_INSTALL_DESTDIR_PREFIX}/${module}\"\n+\tif [ -f \"${module}\" ] ; then\n+\t\t\"${ipa_sign}\" \"${key}\" \"${module}\" \"${module}.sign\"\n+\tfi\n done\ndiff --git a/src/ipa/meson.build b/src/ipa/meson.build\nindex b103479c1cd0..fd4b2c30438d 100644\n--- a/src/ipa/meson.build\n+++ b/src/ipa/meson.build\n@@ -19,10 +19,12 @@ subdir('libipa')\n ipa_sign = files('ipa-sign.sh')\n \n ipas = ['raspberrypi', 'rkisp1', 'vimc']\n+ipa_names = []\n \n foreach pipeline : get_option('pipelines')\n if ipas.contains(pipeline)\n subdir(pipeline)\n+ ipa_names += join_paths(ipa_install_dir, ipa_name + '.so')\n endif\n endforeach\n \n@@ -31,6 +33,6 @@ if ipa_sign_module\n # .sign files, as meson strips the DT_RPATH and DT_RUNPATH from binaries at\n # install time, which invalidates the signatures.\n meson.add_install_script('ipa-sign-install.sh',\n- ipa_install_dir,\n- ipa_priv_key.full_path())\n+ ipa_priv_key.full_path(),\n+ ipa_names)\n endif\n","prefixes":["libcamera-devel"]}