From b39639a85e4d0e8b620dcee989e6c5e83bc6de7e Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Sun, 22 Feb 2009 23:26:24 +0000 Subject: [PATCH] review dependencies globally : fewer are attached to myplc directly, and more are attached to the other PL subcomponents --- bootmanager.spec | 3 +++ build.sh | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/bootmanager.spec b/bootmanager.spec index 73a9dfb..708d9ce 100644 --- a/bootmanager.spec +++ b/bootmanager.spec @@ -26,6 +26,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: tar, gnupg, sharutils, bzip2, pypcilib Requires: PLCAPI >= 5.0 +# the python code packaged in these are shipped on the node as well +Requires: pypcilib pyplnet monitor-runlevelagent + AutoReqProv: no %define debug_package %{nil} diff --git a/build.sh b/build.sh index 363c5a5..5fa20a8 100755 --- a/build.sh +++ b/build.sh @@ -90,10 +90,12 @@ if [ -f "$PLC_DEBUG_SSH_KEY_PUB" ] ; then install -D -m 644 "$PLC_DEBUG_SSH_KEY_PUB" $srcdir/source/debug_files/debug_root_ssh_key fi -# Add pypcilib and pyplnet +# Add python code from the following packages +# make sure they are in the 'Requires' header of the specfile +required_rpms="pypcilib pyplnet monitor-runlevelagent" extra_libs=`mktemp -d "/tmp/.bootmanager.XXXXXX"` mkdir $extra_libs/source -cp -p $(rpm -ql pypcilib pyplnet monitor-runlevelagent | grep -v '\.py[co]$') $extra_libs/source +cp -p $(rpm -ql $required_rpms | grep -v '\.py[co]$') $extra_libs/source # Embed the uuencoded tarball in the script tar -cj -C $srcdir source/ -C $extra_libs source/ | uuencode -m - >> $DEST_SCRIPT -- 2.43.0