From e97d0fc8c4dcf81395a65d937f248f081f154af7 Mon Sep 17 00:00:00 2001
From: Aaron Klingaman <alk@cs.princeton.edu>
Date: Mon, 12 Apr 2004 17:06:40 +0000
Subject: [PATCH] changes for new build process
---
Makefile | 21 +++------------------
ipod.spec | 28 +++++++++++++++++++++++-----
2 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/Makefile b/Makefile
index 338dc58..dbe3395 100644
--- a/Makefile
+++ b/Makefile
@@ -7,31 +7,16 @@
# test: runs the tests on the current machine
#
-ALLBUILD=pl-poddoit pod ipod-2.0.tar.gz
-PLBIN=/usr/local/planetlab/bin/
-INIT=/etc/init.d/
+ALLBUILD=pl-poddoit pod
all: $(ALLBUILD)
pod: pod.src disable_pod.sh enable_pod.sh status_pod.sh
./shell_include --source pod.src --destination pod
-ipod-2.0.tar.gz: pod ipod.spec
- mkdir ipod-2.0
- cp ipod.spec disable_pod.sh enable_pod.sh INTEL_LICENSE.txt ipod.patch \
- Makefile pl-podcntl pl-poddoit.c pl-podset pl-podzap pod.src \
- README shell_include status_pod.sh test-pod ipod-2.0
- tar cvfz ipod-2.0.tar.gz ipod-2.0
- rm -rf ipod-2.0
-
pl-poddoit: pl-poddoit.c
gcc pl-poddoit.c -o pl-poddoit
-install: all
- cp pl-poddoit $(PLBIN)
- chmod 555 $(PLBIN)/pl-poddoit
- cp pod $(INIT)
- chmod 555 $(INIT)/pod
-
clean:
- rm -f pod pl-poddoit ipod-2.0.tar.gz
+ rm -f pod pl-poddoit
+
diff --git a/ipod.spec b/ipod.spec
index 3161ead..5185c41 100644
--- a/ipod.spec
+++ b/ipod.spec
@@ -1,10 +1,15 @@
+%define name ipod
+%define version 2.0
+%define release 3
+
Summary: PlanetLab ICMP Ping of Death
-Name: ipod
-Version: 2.0
-Release: 2
+Name: %{name}
+Version: %{version}
+Release: %{release}
Copyright: GPL
Group: System Environment/Kernel
-Source: ipod-2.0.tar.gz
+Source: %{name}-%{version}.tar.gz
+BuildRoot: /tmp/%{name}-%{version}-root
%description
Startup service to enable Ping Of Death
@@ -16,10 +21,18 @@ Startup service to enable Ping Of Death
%build
make
+
%install
-make install
+mkdir -p $RPM_BUILD_ROOT/usr/local/planetlab/bin
+mkdir -p $RPM_BUILD_ROOT/etc/init.d
+
+cp pl-poddoit $RPM_BUILD_ROOT/usr/local/planetlab/bin/
+cp pod $RPM_BUILD_ROOT/etc/init.d/
+
%clean
+rm -rf $RPM_BUILD_ROOT
+
%files
%defattr(-, root, root)
@@ -48,3 +61,8 @@ fi
%postun
+
+%changelog
+* Mon Apr 12 2004 Aaron Klingaman <alk@cs.princeton.edu>
+- moved to new build process
+- added change log
--
2.47.0