7015392 the build should really fail if the pkg tools fail
7033721 pkglint workarounds in bison-runtime can now be removed
--- a/components/a2ps/Makefile Mon Apr 11 15:06:03 2011 -0600
+++ b/components/a2ps/Makefile Mon Apr 11 18:02:35 2011 -0700
@@ -51,7 +51,7 @@
ln -s $(SOURCE_DIR)/doc/make-authors.pl ; \
ln -s $(SOURCE_DIR)/doc/translators.txt) ; \
(cd $(@D)/sheets ; \
- for sheet in $(SOURCE_DIR)/sheets/*.ssh ; do ; \
+ for sheet in $(SOURCE_DIR)/sheets/*.ssh ; do \
ln -s $$sheet ; \
done)
--- a/components/bison/bison-runtime.p5m Mon Apr 11 15:06:03 2011 -0600
+++ b/components/bison/bison-runtime.p5m Mon Apr 11 18:02:35 2011 -0700
@@ -34,10 +34,6 @@
license bison.license license="GPLv2"
-# note that until the bison bits are removed from the gcc-3-runtime package
-# we have (valid) pkglint complaints, but they need to be disabled for now
-# or the build fails.
-
dir path=usr
dir path=usr/sfw
dir path=usr/sfw/lib
@@ -90,30 +86,30 @@
dir path=usr/share/locale/vi/LC_MESSAGES
dir path=usr/share/locale/zh_TW
dir path=usr/share/locale/zh_TW/LC_MESSAGES
-file path=usr/sfw/lib/$(MACH64)/liby.so.1 pkg.linted=true
-file path=usr/sfw/lib/liby.so.1 pkg.linted=true
-file path=usr/share/locale/da/LC_MESSAGES/bison-runtime.mo pkg.linted=true
-file path=usr/share/locale/de/LC_MESSAGES/bison-runtime.mo pkg.linted=true
-file path=usr/share/locale/es/LC_MESSAGES/bison-runtime.mo pkg.linted=true
-file path=usr/share/locale/et/LC_MESSAGES/bison-runtime.mo pkg.linted=true
-file path=usr/share/locale/fr/LC_MESSAGES/bison-runtime.mo pkg.linted=true
-file path=usr/share/locale/ga/LC_MESSAGES/bison-runtime.mo pkg.linted=true
-file path=usr/share/locale/hr/LC_MESSAGES/bison-runtime.mo pkg.linted=true
-file path=usr/share/locale/id/LC_MESSAGES/bison-runtime.mo pkg.linted=true
-file path=usr/share/locale/it/LC_MESSAGES/bison-runtime.mo pkg.linted=true
-file path=usr/share/locale/ja/LC_MESSAGES/bison-runtime.mo pkg.linted=true
-file path=usr/share/locale/ms/LC_MESSAGES/bison-runtime.mo pkg.linted=true
-file path=usr/share/locale/nb/LC_MESSAGES/bison-runtime.mo pkg.linted=true
-file path=usr/share/locale/nl/LC_MESSAGES/bison-runtime.mo pkg.linted=true
-file path=usr/share/locale/pl/LC_MESSAGES/bison-runtime.mo pkg.linted=true
-file path=usr/share/locale/pt_BR/LC_MESSAGES/bison-runtime.mo pkg.linted=true
-file path=usr/share/locale/ro/LC_MESSAGES/bison-runtime.mo pkg.linted=true
-file path=usr/share/locale/ru/LC_MESSAGES/bison-runtime.mo pkg.linted=true
-file path=usr/share/locale/rw/LC_MESSAGES/bison-runtime.mo pkg.linted=true
-file path=usr/share/locale/sl/LC_MESSAGES/bison-runtime.mo pkg.linted=true
-file path=usr/share/locale/sv/LC_MESSAGES/bison-runtime.mo pkg.linted=true
-file path=usr/share/locale/tr/LC_MESSAGES/bison-runtime.mo pkg.linted=true
-file path=usr/share/locale/vi/LC_MESSAGES/bison-runtime.mo pkg.linted=true
-file path=usr/share/locale/zh_TW/LC_MESSAGES/bison-runtime.mo pkg.linted=true
-link path=usr/sfw/lib/$(MACH64)/liby.so target=liby.so.1 pkg.linted=true
-link path=usr/sfw/lib/liby.so target=liby.so.1 pkg.linted=true
+file path=usr/sfw/lib/$(MACH64)/liby.so.1
+file path=usr/sfw/lib/liby.so.1
+file path=usr/share/locale/da/LC_MESSAGES/bison-runtime.mo
+file path=usr/share/locale/de/LC_MESSAGES/bison-runtime.mo
+file path=usr/share/locale/es/LC_MESSAGES/bison-runtime.mo
+file path=usr/share/locale/et/LC_MESSAGES/bison-runtime.mo
+file path=usr/share/locale/fr/LC_MESSAGES/bison-runtime.mo
+file path=usr/share/locale/ga/LC_MESSAGES/bison-runtime.mo
+file path=usr/share/locale/hr/LC_MESSAGES/bison-runtime.mo
+file path=usr/share/locale/id/LC_MESSAGES/bison-runtime.mo
+file path=usr/share/locale/it/LC_MESSAGES/bison-runtime.mo
+file path=usr/share/locale/ja/LC_MESSAGES/bison-runtime.mo
+file path=usr/share/locale/ms/LC_MESSAGES/bison-runtime.mo
+file path=usr/share/locale/nb/LC_MESSAGES/bison-runtime.mo
+file path=usr/share/locale/nl/LC_MESSAGES/bison-runtime.mo
+file path=usr/share/locale/pl/LC_MESSAGES/bison-runtime.mo
+file path=usr/share/locale/pt_BR/LC_MESSAGES/bison-runtime.mo
+file path=usr/share/locale/ro/LC_MESSAGES/bison-runtime.mo
+file path=usr/share/locale/ru/LC_MESSAGES/bison-runtime.mo
+file path=usr/share/locale/rw/LC_MESSAGES/bison-runtime.mo
+file path=usr/share/locale/sl/LC_MESSAGES/bison-runtime.mo
+file path=usr/share/locale/sv/LC_MESSAGES/bison-runtime.mo
+file path=usr/share/locale/tr/LC_MESSAGES/bison-runtime.mo
+file path=usr/share/locale/vi/LC_MESSAGES/bison-runtime.mo
+file path=usr/share/locale/zh_TW/LC_MESSAGES/bison-runtime.mo
+link path=usr/sfw/lib/$(MACH64)/liby.so target=liby.so.1
+link path=usr/sfw/lib/liby.so target=liby.so.1
--- a/components/gzip/Makefile Mon Apr 11 15:06:03 2011 -0600
+++ b/components/gzip/Makefile Mon Apr 11 18:02:35 2011 -0700
@@ -50,7 +50,7 @@
COMPONENT_POST_INSTALL_ACTION = \
(for dir in $(PROTOUSRBINDIR) $(PROTOUSRSHAREMAN1DIR) ; do \
cd $$dir; \
- for zfile in `ls z*`; do ; \
+ for zfile in `ls z*`; do \
mv $$zfile g$$zfile ; \
done ; \
done)
--- a/make-rules/shared-macros.mk Mon Apr 11 15:06:03 2011 -0600
+++ b/make-rules/shared-macros.mk Mon Apr 11 18:02:35 2011 -0700
@@ -30,6 +30,9 @@
# The workspace starts at the mercurial root
export WS_TOP ?= $(shell hg root)
+export SHELLOPTS = pipefail
+SHELL= /bin/bash
+
CONSOLIDATION = userland
PUBLISHER ?= $(CONSOLIDATION)