diff options
| author | Anas Nashif <anas.nashif@intel.com> | 2012-10-11 15:47:01 -0700 |
|---|---|---|
| committer | Anas Nashif <anas.nashif@intel.com> | 2013-02-02 16:44:15 -0800 |
| commit | 002f6b4eaa35adb008c47cc35f877b697596f62b (patch) | |
| tree | 1de069c57e27552fafc41c8b2e10be97d616e083 /autodeps | |
| parent | 83c6b463ad8ce39b4d4bc82d9259bc414017432f (diff) | |
| download | rpm-002f6b4eaa35adb008c47cc35f877b697596f62b.tar.gz rpm-002f6b4eaa35adb008c47cc35f877b697596f62b.tar.bz2 rpm-002f6b4eaa35adb008c47cc35f877b697596f62b.zip | |
Python dependencies
Diffstat (limited to 'autodeps')
| -rw-r--r-- | autodeps/linux.prov | 6 | ||||
| -rw-r--r-- | autodeps/linux.req | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/autodeps/linux.prov b/autodeps/linux.prov index f88888466..b858e6f6f 100644 --- a/autodeps/linux.prov +++ b/autodeps/linux.prov @@ -11,7 +11,7 @@ filelist=($(printf "%s\n" "${filelist[@]}" | grep -v "/usr/lib/debug/")) solist=($(printf "%s\n" "${filelist[@]}" | grep "\\.so" | grep -v "^/lib/ld.so" | \ tr '\n' '\0' | xargs -0 -r file -L | grep "ELF.*shared object" | \ cut -d: -f1)) -pythonlist= +pythonlist=($(printf "%s\n" "${filelist[@]}" | egrep '/usr/bin/python.\..$')) tcllist= monolist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(exe|dll)\$")) firmwarelist=($(printf "%s\n" "${filelist[@]}" | grep "/lib/firmware/")) @@ -54,8 +54,8 @@ done | sort -u # # --- Python modules. -[ -x /usr/lib/rpm/python.prov -a -n "$pythonlist" ] && - printf "%s\n" "${pythonlist[@]}" | /usr/lib/rpm/python.prov | sort -u +[ -x /usr/lib/rpm/pythondeps.sh -a -n "$pythonlist" ] && + printf "%s\n" "${pythonlist[@]}" | /usr/lib/rpm/pythondeps.sh -P | sort -u # # --- Tcl modules. diff --git a/autodeps/linux.req b/autodeps/linux.req index 2f016d04d..be6ee4f7b 100644 --- a/autodeps/linux.req +++ b/autodeps/linux.req @@ -30,7 +30,7 @@ liblist=($(printf "%s\0" "${filelist[@]}" | xargs -0 -r file | \ interplist=() perllist=() -pythonlist=() +pythonlist=($(printf "%s\n" "${filelist[@]}" | egrep '/usr/lib[^/]*/python.\..')) tcllist=() monolist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(exe|dll)(\\.config)?\$")) @@ -126,8 +126,8 @@ done | sort -u # # --- Python modules. -[ -x /usr/lib/rpm/python.req -a -n "$pythonlist" ] && \ - printf "%s\n" "${pythonlist[@]}" | /usr/lib/rpm/python.req | sort -u +[ -x /usr/lib/rpm/pythondeps.sh -a -n "$pythonlist" ] && \ + printf "%s\n" "${pythonlist[@]}" | /usr/lib/rpm/pythondeps.sh -R | sort -u # # --- Tcl modules. |