Author: baggins Date: Wed Mar 21 14:08:22 2012 GMT Module: packages Tag: HEAD ---- Log message: - rpm != redhat - symlink may need a target directory
---- Files affected: packages/dracut: dracut.spec (1.5 -> 1.6) , create-target-dir-for-symlink.patch (NONE -> 1.1) (NEW), no-rh.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/dracut/dracut.spec diff -u packages/dracut/dracut.spec:1.5 packages/dracut/dracut.spec:1.6 --- packages/dracut/dracut.spec:1.5 Wed Mar 21 13:44:07 2012 +++ packages/dracut/dracut.spec Wed Mar 21 15:08:17 2012 @@ -8,6 +8,8 @@ Source0: ftp://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz # Source0-md5: 8c966954cd973b5abbd7193368f1d5cc Source1: pld.conf +Patch0: no-rh.patch +Patch1: create-target-dir-for-symlink.patch URL: https://dracut.wiki.kernel.org/ BuildRequires: docbook-style-xsl BuildRequires: libxslt-progs @@ -92,6 +94,8 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build %{__make} @@ -230,6 +234,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.6 2012/03/21 14:08:17 baggins +- rpm != redhat +- symlink may need a target directory + Revision 1.5 2012/03/21 12:44:07 baggins - add config for PLD ================================================================ Index: packages/dracut/create-target-dir-for-symlink.patch diff -u /dev/null packages/dracut/create-target-dir-for-symlink.patch:1.1 --- /dev/null Wed Mar 21 15:08:22 2012 +++ packages/dracut/create-target-dir-for-symlink.patch Wed Mar 21 15:08:17 2012 @@ -0,0 +1,16 @@ +--- dracut/dracut-functions.sh~ 2012-02-24 15:38:08.000000000 +0100 ++++ dracut/dracut-functions.sh 2012-03-21 15:03:12.440030577 +0100 +@@ -540,7 +540,12 @@ + inst "$_realsrc" + fi + fi +- [[ -d ${_target%/*} ]] && _target=$(readlink -f ${_target%/*})/${_target##*/} ++ if [[ -d ${_target%/*} ]]; then ++ if ! [[ -d "$initdir/${_target%/*}" ]]; then ++ inst_dir "${_target%/*}" ++ fi ++ _target=$(readlink -f ${_target%/*})/${_target##*/} ++ fi + ln -sfn $(convert_abs_rel "${_target}" "${_realsrc}") "$initdir/$_target" + } + ================================================================ Index: packages/dracut/no-rh.patch diff -u /dev/null packages/dracut/no-rh.patch:1.1 --- /dev/null Wed Mar 21 15:08:22 2012 +++ packages/dracut/no-rh.patch Wed Mar 21 15:08:17 2012 @@ -0,0 +1,11 @@ +--- dracut-017/modules.d/10rpmversion/module-setup.sh~ 2012-02-24 15:38:08.000000000 +0100 ++++ dracut-017/modules.d/10rpmversion/module-setup.sh 2012-03-21 14:06:18.113626194 +0100 +@@ -4,7 +4,7 @@ + + check() { + [[ "$mount_needs" ]] && return 1 +- [ -f /etc/redhat-release ] ++ [ -x /bin/rpm ] + } + + depends() { ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/dracut/dracut.spec?r1=1.5&r2=1.6 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
