It looks
cloudstack-dev@incubator.apache.org<mailto:cloudstack-dev@incubator.apache.org>
will strip out the attachment, thanks Kevin for letting me know...
Wido/Frank,
Here is the patch:
diff --git a/debian/cloud-agent.install b/debian/cloud-agent.install
index 5a05311..5ef72ce 100644
--- a/debian/cloud-agent.install
+++ b/debian/cloud-agent.install
@@ -5,8 +5,4 @@
/etc/init.d/cloud-agent
/usr/bin/agent-runner
/usr/bin/cloud-setup-agent
-/usr/lib/cloud/agent/css
-/usr/lib/cloud/agent/ui
-/usr/lib/cloud/agent/js
-/usr/lib/cloud/agent/images
/var/log/cloud/agent
diff --git a/debian/control b/debian/control
index 32272f6..957eaa4 100644
--- a/debian/control
+++ b/debian/control
@@ -73,15 +73,6 @@ Description: CloudStack agent scripts
will participate in your cloud -- this is a requirement for the CloudStack
agent.
-Package: cloud-daemonize
-Provides: vmops-daemonize
-Conflicts: vmops-daemonize
-Replaces: vmops-daemonize
-Architecture: any
-Description: CloudStack daemonization utility
- This package contains a program that daemonizes the specified
- process. The CloudStack Cloud Stack uses this to start the agent
- as a service.
Package: cloud-core
Provides: vmops-core
@@ -156,12 +147,6 @@ Description: CloudStack system iso
a CloudStack Cloud Stack-powered cloud. Install this package if this computer
will participate in your cloud.
-Package: cloud-console-proxy
-Architecture: any
-Depends: openjdk-6-jre, cloud-utils (= ${source:Version}), cloud-core (=
${source:Version}), cloud-deps (= ${source:Version}), cloud-agent-libs (=
${source:Version}), python, cloud-python (= ${source:Version}),
libcommons-httpclient-java, libcommons-collections-java, libcommons-dbcp-java,
libcommons-pool-java, libcommons-logging-java, cloud-daemonize, sysvinit-utils,
chkconfig, augeas-tools, uuid-runtime, grep, iproute
-Description: CloudStack console proxy
- The CloudStack console proxy is the service in charge of granting console
- access into virtual machines managed by the CloudStack CloudStack.
Package: cloud-usage
Provides: vmops-usage
~
From: Pradeep Soundararajan [mailto:pradeep.soundarara...@citrix.com]
Sent: Monday, May 28, 2012 2:58 PM
To: Frank Zhang; cloudstack-dev@incubator.apache.org
Subject: RE: [PATCH] Ubuntu: Do not package the sccs-info file, it's not
generated
Hi Wido,
Please let me know are you able to do the Ubuntu build on * master branch.
I am able to do the Ubuntu build (./waf deb) on * master branch only after with
these modifications. Please find the diff log attached.
# modified: debian/cloud-agent.install
# modified: debian/control
Are you sure shall I proceed with these check-ins?, then only I feel we can
verify the install.
Thanks,
Pradeep.S
-----Original Message-----
From: Frank Zhang
Sent: Wednesday, May 23, 2012 11:49 PM
To:
cloudstack-dev@incubator.apache.org<mailto:cloudstack-dev@incubator.apache.org>
Cc: Pradeep Soundararajan
Subject: RE: [PATCH] Ubuntu: Do not package the sccs-info file, it's not
generated
Wido:
Our master is no differences than others you used to work with.
3.0.x is just for our recent releases(in six month release window) so
most patches come to 3.0.x first and then merge to master as well.
So once we face a bug, 3.0.x comes to my mind first because that's I am
working on lately.
BTW: our master also has blooding edge code, sure enough.
Pradeep:
Could you check master and if the file is missing? Thank you.
> -----Original Message-----
> From: Wido den Hollander
> [mailto:w...@widodh.nl]<mailto:[mailto:w...@widodh.nl]>
> Sent: Tuesday, May 22, 2012 11:51 PM
> To:
> cloudstack-dev@incubator.apache.org<mailto:cloudstack-dev@incubator.apache.org>
> Cc: Frank Zhang; Pradeep Soundararajan
> Subject: Re: [PATCH] Ubuntu: Do not package the sccs-info file, it's
> not generated
>
>
>
> On 22-05-12 20:04, Frank Zhang wrote:
> > Pradeep, please install and verify the file is indeed installed.
> > Wido: which branch you observed this issue? thanks
>
> All my patches are for the master branch, I'm not working with the
> 3.0.x branch.
>
> I still don't know what the difference between the two is, I'm used to
> work with the master branch in various projects, they always have the
> bleeding edge code.
>
> Wido
>
> >
> > _____________________________________________
> > From: Pradeep Soundararajan
> > Sent: Tuesday, May 22, 2012 3:17 AM
> > To: Frank Zhang;
> > cloudstack-dev@incubator.apache.org<mailto:cloudstack-dev@incubator.apache.org>
> > Subject: RE: [PATCH] Ubuntu: Do not package the sccs-info file, it's
> > not generated
> >
> >
> > Hi Frank,
> >
> > I am able to see the files after my build in these location:
> >
> > ./artifacts/debbuild/cloud-2.2/debian/tmp/usr/share/doc/cloud/sccs-i
> > nf
> > o
> > ./artifacts/debbuild/cloud-2.2/debian/cloud-utils/usr/share/doc/clou
> > d/ sccs-info ./artifacts/debbuild/cloud-2.2/sccs-info
> >
> > Please let me know what should I do now.
> >
> > Note: I was doing the build from 'master' branch (./waf deb)
> >
> > Thanks,
> > Pradeep.S
> >
> > -----Original Message-----
> > From: Frank Zhang
> > Sent: Tuesday, May 22, 2012 1:13 AM
> > To:
> > cloudstack-dev@incubator.apache.org<mailto:cloudstack-<mailto:cloudstack-dev@incubator.apache.org%3cmailto:cloudstack->
> d...@incubator.ap<mailto:d...@incubator.ap>
> > ache.org>
> > Cc: Pradeep Soundararajan
> > Subject: RE: [PATCH] Ubuntu: Do not package the sccs-info file, it's
> > not generated
> >
> >>
> >> On Mon, May 21, 2012 at 2:19 PM, Frank
> >> Zhang<frank.zh...@citrix.com<mailto:frank.zh...@citrix.com<mailto:frank.zh...@citrix.com%3cmailto:frank.zh...@citrix.com>>>
> >> wrote:
> >>> Hi Wido:
> >>> It seems a bug to me if the file is not here, we use this
> >>> file to track git
> >> commit from which package is built.
> >>>
> >>> Pradeep:
> >>> Can you verify this and log a bug to yourself:) if the file is
> >>> not here.
> >> thank you.
> >>>
> >>
> >> I am fine with logging a bug to fix this, but it was initially
> >> reported back in December when Wido initially sent this patch in.
> >> We have not fixed it in the interim, and effectively leaves us with
> >> 'magical build system', and we effectively have broken
> >> Debian/Ubuntu builds (outside of the magical build
> >> box) for at least 6 months now, which is unacceptable. I'd merge
> >> this and revert it later when you get the problem fixed.
> >
> > Pradeep is our dedicated build engineer now, he will take care of
> > all build
> bugs.
> >
> >>
> >> --David
> >
> >
