openbsdbinpatch-misc

[Openbsdbinpatch-misc] "combo" diff

[Mike E. <mi...@er...>]

Below is a diff to bsd.binpatch.mk that adds a "combo" target.
It iterates through the binpatch packages <= ${PATCH} untarring
them to a temporary location.  Then creates an "upto${PATCH}" tarball.

Thoughts?

-ME

--- bsd.binpatch.mk	Mon Mar 31 01:40:25 2008
+++ bsd.binpatch.mk	Mon Mar 31 01:51:57 2008
@@ -257,6 +257,26 @@ package: build
 	@echo "|"
 	@echo "+-------------------------"
 
+${PACKAGEDIR}/${DISTNAME}-${ARCH}-upto${PATCH}.tgz: ${PACKAGEDIR}/${FULLPKGNAME}.tgz
+	@echo "===>  Building combination package for ${PATCH}"
+	@rm -Rf ${.CURDIR}/.combo_pkg
+	@mkdir -p ${.CURDIR}/.combo_pkg
+	@count=0;\
+	while [ $$count -lt ${PATCH} ]; do \
+	  count=`expr $$count + 1`;\
+	  mypkg=${DISTNAME}-${ARCH}-`printf "%03d\n" $$count`.tgz; \
+	  if [ -f ${PACKAGEDIR}/$$mypkg ]; then \
+	    echo "======> Extracting $$mypkg"; \
+	     tar -C ${.CURDIR}/.combo_pkg/ -xzphf ${PACKAGEDIR}/$$mypkg; \
+	  fi; \
+	done
+	@echo "======> Creating ${DISTNAME}-${ARCH}-upto${PATCH}.tgz"
+	@tar -C ${WRKINST} -czpf ${PACKAGEDIR}/${DISTNAME}-${ARCH}-upto${PATCH}.tgz \
+	  `(cd ${.CURDIR}/.combo_pkg && find . -type f)`
+	@rm -Rf ${.CURDIR}/.combo_pkg
+
+combo: ${PACKAGEDIR}/${DISTNAME}-${ARCH}-upto${PATCH}.tgz
+
 # Installs the binary patch
 install:
 	tar xzpf ${PACKAGEDIR}/${FULLPKGNAME}.tgz -C /

Re: [Openbsdbinpatch-misc] "combo" diff

[G. S. G. G. <ger...@gm...>]

Hi Mike,

I guess this line
+         mypkg=${DISTNAME}-${ARCH}-`printf "%03d\n" $$count`.tgz; \

shoud be
+         mypkg=${DISTNAME}-${ARCH}-`printf "%03d" $$count`.tgz; \

without the new line.

It looks fine to me.

The only issue I see is that the user may expect that this new target
also builds the packages, if they don't exist. Nothing that the
documentation can't fix though.

Any other thought?

-- 
Gerardo Santana

Re: [Openbsdbinpatch-misc] "combo" diff

[Mike E. <mi...@er...>]

On Mon, Apr 21, 2008 at 02:57:42PM -0500, Gerardo Santana G?mez Garrido wrote:
> Hi Mike,
> 
> I guess this line
> +         mypkg=${DISTNAME}-${ARCH}-`printf "%03d\n" $$count`.tgz; \
> 
> shoud be
> +         mypkg=${DISTNAME}-${ARCH}-`printf "%03d" $$count`.tgz; \
> 
> without the new line.

Haha!  Of course the \n snuck in there from testing.  Strangely, it
works even with the \n in there.  But, you're right... It shouldn't be
there.

> It looks fine to me.
> 
> The only issue I see is that the user may expect that this new target
> also builds the packages, if they don't exist. Nothing that the
> documentation can't fix though.
> 
> Any other thought?

I think documentation is the way to go.

> -- 
> Gerardo Santana

-ME

Re: [Openbsdbinpatch-misc] "combo" diff

[G. S. G. G. <ger...@gm...>]

On 4/21/08, Mike Erdely <mi...@er...> wrote:
> Below is a diff to bsd.binpatch.mk that adds a "combo" target.
> It iterates through the binpatch packages <= ${PATCH} untarring
> them to a temporary location.  Then creates an "upto${PATCH}" tarball.
>
> Thoughts?

Ok, I have looked closer and I have two questions.


> --- bsd.binpatch.mk	Mon Mar 31 01:40:25 2008
> +++ bsd.binpatch.mk	Mon Mar 31 01:51:57 2008
> @@ -257,6 +257,26 @@ package: build
>  	@echo "|"
>  	@echo "+-------------------------"
>
> +${PACKAGEDIR}/${DISTNAME}-${ARCH}-upto${PATCH}.tgz:
> ${PACKAGEDIR}/${FULLPKGNAME}.tgz
> +	@echo "===>  Building combination package for ${PATCH}"
> +	@rm -Rf ${.CURDIR}/.combo_pkg
> +	@mkdir -p ${.CURDIR}/.combo_pkg

1. did you choose ${.CURDIR} instead of ${.WRKDIR} for creating
.combo_pkg for a reason?


2. Does -C has any purpose here?

> +	@tar -C ${WRKINST} -czpf
> ${PACKAGEDIR}/${DISTNAME}-${ARCH}-upto${PATCH}.tgz \
> +	  `(cd ${.CURDIR}/.combo_pkg && find . -type f)`
> +	@rm -Rf ${.CURDIR}/.combo_pkg

Thanks in advance.
-- 
Gerardo Santana