Author: sparky
Date: Fri Apr 28 20:31:46 2006
New Revision: 7375
Added:
ppcrcd/trunk/patches/
ppcrcd/trunk/patches/kernel-squashfs-lzma.patch
- copied unchanged from rev 7360, ppcrcd/trunk/kernel-squashfs-lzma.patch
ppcrcd/trunk/patches/kernel.spec.patch
- copied unchanged from rev 7360, ppcrcd/trunk/kernel.spec-patch
ppcrcd/trunk/patches/pldconf.patch
- copied unchanged from rev 7360, ppcrcd/trunk/pldconf.patch
ppcrcd/trunk/patches/rpm.spec.patch
- copied unchanged from rev 7363, ppcrcd/trunk/rpm.spec.patch
Removed:
ppcrcd/trunk/kernel-squashfs-lzma.patch
ppcrcd/trunk/kernel.spec-patch
ppcrcd/trunk/pldconf.patch
ppcrcd/trunk/rpm.spec.patch
Modified:
ppcrcd/trunk/add.pkgs
ppcrcd/trunk/base.pkgs
Log:
- patches moved to 'patches' dir
Modified: ppcrcd/trunk/add.pkgs
==============================================================================
--- ppcrcd/trunk/add.pkgs (original)
+++ ppcrcd/trunk/add.pkgs Fri Apr 28 20:31:46 2006
@@ -232,14 +232,14 @@
### SPECIAL ###
-out/rpm/SPECS/pldconf.spec: out/touch/builder_prepared pldconf.patch
+out/rpm/SPECS/pldconf.spec: out/touch/builder_prepared patches/pldconf.patch
rm -rf $@
cd $(dir $@) && cvs up $(if $(REV-$(@:out/rpm/SPECS/%.spec=%)),-r \
$(REV-$(@:out/rpm/SPECS/%.spec=%)),-A) $(notdir $@)
sed -e '/^# Source/aPatch666: %{name}-ppcrcd.patch' \
-e '/^%setup/a%patch666 -p1' \
-i $@
- cp pldconf.patch out/rpm/SOURCES/pldconf-ppcrcd.patch
+ cp patches/pldconf.patch out/rpm/SOURCES/pldconf-ppcrcd.patch
sleep 1 && touch $@
out/touch/compl_no_mount: out/root/stripped
Modified: ppcrcd/trunk/base.pkgs
==============================================================================
--- ppcrcd/trunk/base.pkgs (original)
+++ ppcrcd/trunk/base.pkgs Fri Apr 28 20:31:46 2006
@@ -300,23 +300,23 @@
-i $@
sleep 1 && touch $@
-out/rpm/SPECS/kernel.spec: out/touch/builder_prepared \
- kernel.config kernel-squashfs-lzma.patch kernel.spec-patch
+out/rpm/SPECS/kernel.spec: out/touch/builder_prepared kernel.config \
+ patches/kernel-squashfs-lzma.patch patches/kernel.spec.patch
rm -f $@
cd $(dir $@) && cvs up $(if $(REV-$(@:out/rpm/SPECS/%.spec=%)),-r \
$(REV-$(@:out/rpm/SPECS/%.spec=%)),-A) $(notdir $@)
rm -f $(touch)/kerneleq
- cd out/rpm/SPECS && patch -p0 < $(PWD)/kernel.spec-patch
- cp kernel-squashfs-lzma.patch out/rpm/SOURCES
+ cd out/rpm/SPECS && patch -p0 < $(PWD)/patches/kernel.spec.patch
+ cp patches/kernel-squashfs-lzma.patch out/rpm/SOURCES
cp kernel.config out/rpm/SOURCES/kernel-ppc.config
cp kernel.config out/rpm/SOURCES/kernel-ppc-smp.config
sleep 1 && touch $@
-out/rpm/SPECS/rpm.spec: out/touch/builder_prepared rpm.spec.patch
+out/rpm/SPECS/rpm.spec: out/touch/builder_prepared
patches/rpm.spec.patch
rm -f $@
cd $(dir $@) && cvs up $(if $(REV-$(@:out/rpm/SPECS/%.spec=%)),-r \
$(REV-$(@:out/rpm/SPECS/%.spec=%)),-A) $(notdir $@)
- cd out/rpm/SPECS && patch -p0 < $(PWD)/rpm.spec.patch
+ cd out/rpm/SPECS && patch -p0 < $(PWD)/patches/rpm.spec.patch
sleep 1 && touch $@
out/rpm/prep/busybox: out/rpm/sources/busybox busybox-initrd.config
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
