From 1421ffc38c3270c88ae7e90ec9dc535d3e676b4f Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Mon, 7 Jul 2008 11:29:14 +0530 Subject: Update jobuild syntax to latest design - No setup_phase required -- all setup is done before the jobuild is run - We're already chrooted when the jobuild is run. Hence, chroot_phase -> do_work - cleanup_phase -> cleanup - unpack_phase -> src_unpack -- we can use the same syntax too ;) * SRC_URI are fetched before chrooting - Remove old PORTCONF_URI vars; portage config is in conf/ --- bheekling/build-brasero/build-brasero-1.0.jobuild | 17 ++++++----------- bheekling/test-beagle/test-beagle-1.0.jobuild | 17 +++++------------ bheekling/test-libbeagle/test-libbeagle-1.0.jobuild | 17 +++++------------ 3 files changed, 16 insertions(+), 35 deletions(-) diff --git a/bheekling/build-brasero/build-brasero-1.0.jobuild b/bheekling/build-brasero/build-brasero-1.0.jobuild index e16f685..05f04cc 100644 --- a/bheekling/build-brasero/build-brasero-1.0.jobuild +++ b/bheekling/build-brasero/build-brasero-1.0.jobuild @@ -11,22 +11,17 @@ DEPEND="bheekling/test-libbeagle" # And don't need it's effects on this chroot to continue SIDEPEND="" -# Get SRC_URI and unpack -unpack_phase() { +# Unpack SRC_URI +src_unpack() { echo 'unpack' } -# Do various setup -setup_phase() { - echo 'setup' -} - -# Chroot and do work -chroot_phase() { - echo 'chroot' +# Do work +do_work() { + echo 'work' } # Cleanup -cleanup_phase() { +cleanup() { echo 'cleanup' } diff --git a/bheekling/test-beagle/test-beagle-1.0.jobuild b/bheekling/test-beagle/test-beagle-1.0.jobuild index 692e563..1e5f46e 100644 --- a/bheekling/test-beagle/test-beagle-1.0.jobuild +++ b/bheekling/test-beagle/test-beagle-1.0.jobuild @@ -3,8 +3,6 @@ # List of stuff this jobuild needs # Excluding portage config files SRC_URI="" -# Portage config files -PORTCONF_URI="" # DEPEND on a jobuild with glee # The job must be completed in the same chroot DEPEND="" @@ -13,22 +11,17 @@ DEPEND="" # And don't need it's effects on this chroot to continue SIDEPEND="" -# Get SRC_URI and unpack -unpack_phase() { +# Unpack SRC_URI +src_unpack() { : } -# Do various setup -setup_phase() { - : -} - -# Chroot and do work -chroot_phase() { +# Do work +do_work() { : } # Cleanup -cleanup_phase() { +cleanup() { : } diff --git a/bheekling/test-libbeagle/test-libbeagle-1.0.jobuild b/bheekling/test-libbeagle/test-libbeagle-1.0.jobuild index 318d2b2..88a01b3 100644 --- a/bheekling/test-libbeagle/test-libbeagle-1.0.jobuild +++ b/bheekling/test-libbeagle/test-libbeagle-1.0.jobuild @@ -3,8 +3,6 @@ # List of stuff this jobuild needs # Excluding portage config files SRC_URI="" -# Portage config files -PORTCONF_URI="" # DEPEND on a jobuild with glee # The job must be completed in the same chroot DEPEND="bheekling/test-beagle" @@ -13,22 +11,17 @@ DEPEND="bheekling/test-beagle" # And don't need it's effects on this chroot to continue SIDEPEND="" -# Get SRC_URI and unpack -unpack_phase() { +# Unpack SRC_URI +src_unpack() { : } -# Do various setup -setup_phase() { - : -} - -# Chroot and do work -chroot_phase() { +# Do work +do_work() { : } # Cleanup -cleanup_phase() { +cleanup() { : } -- cgit v1.2.3-65-gdbad