Thanks Tom, it's working perfectly!!!:) - build50 now support the -S option to build master source package(patch 1): Any reason why build50 does not creat the source package for shorewall-core and shorewall-init?
- Sudo is not always available; so I've added an if statement that look for it(patch 2)! Attached as build50-2.patch Request if that makes sense!: Could what has already been done also be applied for the -h -x -S options(no tarring step if -t is not used)!? -Matt On 15 Jan 2016 at 14:09, Tom Eastep wrote: > On 01/15/2016 01:23 PM, Tom Eastep wrote: > > Hi Matt, > > > > On 01/15/2016 06:52 AM, matt darfeuille wrote: > >> What I'm actually asking is: > >> > >> Build50 wil creat three things for eatch product: > >> > >> 1) The directory > >> 2) The .tar.bz2 file > >> 3) The .tgz file > >> > >> And what I would like if possible is only the directory(1); so for > >> example: > >> > >> ./build50 -c 5.0.4-Beta2 > >> > >> would only creat the directory > >> > >> shorewall-core-5.0.4-Beta2 > >> > >> but any of the archive files(2 3) > >> > >> In other words: > >> > >> Could the build50 script provide a way to skip the tarring step?! > > > > I just pushed a change which does that. > > > > I also just pushed a change that implements a -I (install) option which > causes the specified packages to be build then installed using sudo. > > -Tom > -- > Tom Eastep \ When I die, I want to go like my Grandfather who > Shoreline, \ died peacefully in his sleep. Not screaming like > Washington, USA \ all of the passengers in his car > http://shorewall.net \________________________________________________ > > -------------- Enclosure number 1 ---------------- >From 3b8d817a2f4f03d0cd5cfbcaf7b4c596a29448e5 Mon Sep 17 00:00:00 2001 From: Matt Darfeuille <matd...@gmail.com> Date: Sat, 16 Jan 2016 15:34:22 +0100 Subject: [PATCH 1/2] Improved -S (build source) option in build50 Fix the -S option to build master source package Signed-off-by: Matt Darfeuille <matd...@gmail.com> --- build/build50 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build/build50 b/build/build50 index d866afc..63a61b0 100755 --- a/build/build50 +++ b/build/build50 @@ -35,6 +35,7 @@ # -i Build Init # -h Build HTML documentation # -x Build XML documentation +# -S Build master source package # -I Install # # If no options are given, all options are assumed. @@ -438,9 +439,9 @@ while [ -z "$done" ]; do BUILD6LITE=Yes option=${option#L} ;; - s*) + S*) BUILDSRC=Yes - option=${option#s} + option=${option#S} ;; I*) INSTALL=Yes -- 2.6.2 >From 8d5a1ac3cb64a2f3983286f106e977814de8f954 Mon Sep 17 00:00:00 2001 From: Matt Darfeuille <matd...@gmail.com> Date: Sat, 16 Jan 2016 16:25:00 +0100 Subject: [PATCH 2/2] Added detection of sudo in build50 script Sudo will be used if available when the -I option is passed Signed-off-by: Matt Darfeuille <matd...@gmail.com> --- build/build50 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/build/build50 b/build/build50 index 63a61b0..93a2e54 100755 --- a/build/build50 +++ b/build/build50 @@ -869,12 +869,21 @@ if [ -n "${BUILDCORE}${BUILD6}${BUILDINIT}${BUILDLITE}${BUILD6LITE}${BUILDSTD}" fi if [ -n "$INSTALL" ]; then + if which sudo &> /dev/null; then [ -n "$BUILDCORE" ] && sudo $COREDIR/install.sh [ -n "$BUILDSTD" ] && sudo $SHOREWALLDIR/install.sh [ -n "$BUILD6" ] && sudo $SHOREWALL6DIR/install.sh [ -n "$BUILDLITE" ] && sudo $SHOREWALLLITEDIR/install.sh [ -n "$BUILDINIT" ] && sudo $SHOREWALLINITDIR/install.sh [ -n "$BUILD6LITE" ] && sudo $LITE6DIR/install.sh + else + [ -n "$BUILDCORE" ] && $COREDIR/install.sh + [ -n "$BUILDSTD" ] && $SHOREWALLDIR/install.sh + [ -n "$BUILD6" ] && $SHOREWALL6DIR/install.sh + [ -n "$BUILDLITE" ] && $SHOREWALLLITEDIR/install.sh + [ -n "$BUILDINIT" ] && $SHOREWALLINITDIR/install.sh + [ -n "$BUILD6LITE" ] && $LITE6DIR/install.sh + fi fi if [ -n "${BUILDXML}${BUILDHTML}" ]; then -- 2.6.2 ------------------------------------------------------------------------------ Site24x7 APM Insight: Get Deep Visibility into Application Performance APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month Monitor end-to-end web transactions and take corrective actions now Troubleshoot faster and improve end-user experience. Signup Now! http://pubads.g.doubleclick.net/gampad/clk?id=267308311&iu=/4140 _______________________________________________ Shorewall-users mailing list Shorewall-users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/shorewall-users
