Permalink
Browse files

Move add_pbi_manager() before add_gui() in the list of build steps sp…

…ecified by customize_cmd.

add_pbi_manager() installs tools such as /sbin/pbi_listrepo in the chroot used
during the generation of the GUI.  In add_gui() the Django "python manage.py syncdb"
command is called which triggers the South migration.  The South migration
in turn may try to invoke /sbin/pbi_listrepo.  On the Jenkins build host,
there seemed to be a race condition triggered where add_gui() was called,
but /sbin/pbi_listrepo did not exist.  This resulted in a build break and
Python stack trace during the build.  This should fix that.
  • Loading branch information...
1 parent c93adf3 commit fef1dcd01dde8f3cff75f421965d1dca24bd0496 Craig Rodrigues committed Oct 1, 2013
Showing with 33 additions and 33 deletions.
  1. +33 −33 nanobsd/os-base
View
@@ -390,6 +390,39 @@ hack_nsswitch_conf ( )
}
customize_cmd hack_nsswitch_conf
+add_pbi_manager()
+{
+ local pm dst
+ pm=${AVATAR_ROOT}/src/pcbsd/pbi-manager
+ dst=${NANO_WORLDDIR}/usr/local
+
+ pprint 2 "Adding pbi-manager"
+
+ mkdir -p ${dst}/sbin >/dev/null 2>/dev/null
+ cp ${pm}/pbi-manager ${dst}/sbin/pbi_create
+ ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_add
+ ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_addrepo
+ ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_browser
+ ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_autobuild
+ ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_delete
+ ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_deleterepo
+ ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_icon
+ ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_info
+ ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_indextool
+ ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_listrepo
+ ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_makepatch
+ ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_makeport
+ ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_makerepo
+ ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_metatool
+ ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_patch
+ ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_update
+ ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_update_hashdir
+ ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbid
+ ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi-crashhandler
+ rm -f ${dst}/pbi-manager
+}
+customize_cmd add_pbi_manager
+
add_gui()
{
local gui dst dstCR
@@ -432,39 +465,6 @@ arch_specific_ko()
}
customize_cmd arch_specific_ko
-add_pbi_manager()
-{
- local pm dst
- pm=${AVATAR_ROOT}/src/pcbsd/pbi-manager
- dst=${NANO_WORLDDIR}/usr/local
-
- pprint 2 "Adding pbi-manager"
-
- mkdir -p ${dst}/sbin >/dev/null 2>/dev/null
- cp ${pm}/pbi-manager ${dst}/sbin/pbi_create
- ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_add
- ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_addrepo
- ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_browser
- ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_autobuild
- ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_delete
- ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_deleterepo
- ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_icon
- ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_info
- ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_indextool
- ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_listrepo
- ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_makepatch
- ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_makeport
- ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_makerepo
- ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_metatool
- ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_patch
- ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_update
- ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi_update_hashdir
- ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbid
- ln -f ${dst}/sbin/pbi_create ${dst}/sbin/pbi-crashhandler
- rm -f ${dst}/pbi-manager
-}
-customize_cmd add_pbi_manager
-
add_pc_extractoverlay()
{
local pce src dst pcbsd bin

0 comments on commit fef1dcd

Please sign in to comment.