[patch] shift FILESDIR access into pkg_setup

mips-sources-remove-FILESDIR-abuse.patch (text/plain), 5.82 KB, created by Brian Harring (RETIRED) on 2010-01-10 09:31:52 UTC

diff -urN mips-sources/mips-sources-2.6.27.21-r1.ebuild fixed-mips-sources/mips-sources-2.6.27.21-r1.ebuild
--- mips-sources/mips-sources-2.6.27.21-r1.ebuild	2009-04-12 18:07:14.000000000 -0700
+++ fixed-mips-sources/mips-sources-2.6.27.21-r1.ebuild	2010-01-10 01:29:03.000000000 -0800
@@ -137,24 +137,32 @@
 
 #//------------------------------------------------------------------------------
 
-# All are in ${FILESDIR}/eblits
-# If a message for a given machine needs to change,
-# then we create a new eblit and increment the
-# version and reference it here.
-eblit-include err_disabled_mach v1
-eblit-include err_only_one_mach_allowed v1
-eblit-include show_ip22_info v1
-eblit-include show_ip27_info v1
-eblit-include show_ip28_info v1
-eblit-include show_ip30_info v1
-eblit-include show_ip32_info v1
-eblit-include show_cobalt_info v1
+load_eblit_funcs() {
+    # All are in ${FILESDIR}/eblits
+    # If a message for a given machine needs to change,
+    # then we create a new eblit and increment the
+    # version and reference it here.
+    [ -n "${MIPS_SOURCES_EBLITS_LOADED}" ] && return;
+    eblit-include err_disabled_mach v1
+    eblit-include err_only_one_mach_allowed v1
+    eblit-include show_ip22_info v1
+    eblit-include show_ip27_info v1
+    eblit-include show_ip28_info v1
+    eblit-include show_ip30_info v1
+    eblit-include show_ip32_info v1
+    eblit-include show_cobalt_info v1
 
-# This makes sure pkg_setup & pkg_postinst gets into any binpkg.
-# Neccessary because we can't guarantee FILESDIR is around for binpkgs.
-eblit-pkg setup v1
-eblit-pkg postinst v1
+    # This makes sure pkg_setup & pkg_postinst gets into any binpkg.
+    # Neccessary because we can't guarantee FILESDIR is around for binpkgs.
+    eblit-pkg setup v1
+    eblit-pkg postinst v1
+    MIPS_SOURCES_EBLITS_LOADED=1
+}
 
+pkg_setup() {
+    load_eblit_funcs
+    pkg_setup
+}
 src_unpack() { eblit-run src_unpack v1 ; }
 
 #//------------------------------------------------------------------------------
diff -urN mips-sources/mips-sources-2.6.28.9-r1.ebuild fixed-mips-sources/mips-sources-2.6.28.9-r1.ebuild
--- mips-sources/mips-sources-2.6.28.9-r1.ebuild	2009-04-12 18:07:14.000000000 -0700
+++ fixed-mips-sources/mips-sources-2.6.28.9-r1.ebuild	2010-01-10 01:28:12.000000000 -0800
@@ -137,23 +137,32 @@
 
 #//------------------------------------------------------------------------------
 
-# All are in ${FILESDIR}/eblits
-# If a message for a given machine needs to change,
-# then we create a new eblit and increment the
-# version and reference it here.
-eblit-include err_disabled_mach v1
-eblit-include err_only_one_mach_allowed v1
-eblit-include show_ip22_info v1
-eblit-include show_ip27_info v1
-eblit-include show_ip28_info v1
-eblit-include show_ip30_info v1
-eblit-include show_ip32_info v1
-eblit-include show_cobalt_info v1
-
-# This makes sure pkg_setup & pkg_postinst gets into any binpkg.
-# Neccessary because we can't guarantee FILESDIR is around for binpkgs.
-eblit-pkg setup v1
-eblit-pkg postinst v1
+load_eblit_funcs() {
+    [ -n "${MIPS_SOURCES_EBLITS_LOADED}" ] && return
+    # All are in ${FILESDIR}/eblits
+    # If a message for a given machine needs to change,
+    # then we create a new eblit and increment the
+    # version and reference it here.
+    eblit-include err_disabled_mach v1
+    eblit-include err_only_one_mach_allowed v1
+    eblit-include show_ip22_info v1
+    eblit-include show_ip27_info v1
+    eblit-include show_ip28_info v1
+    eblit-include show_ip30_info v1
+    eblit-include show_ip32_info v1
+    eblit-include show_cobalt_info v1
+
+    # This makes sure pkg_setup & pkg_postinst gets into any binpkg.
+    # Neccessary because we can't guarantee FILESDIR is around for binpkgs.
+    eblit-pkg setup v1
+    eblit-pkg postinst v1
+    MIPS_SOURCES_EBLITS_LOADED=1
+}
+
+pkg_setup() {
+    load_eblit_funcs
+    pkg_setup
+}
 
 src_unpack() { eblit-run src_unpack v1 ; }
 
diff -urN mips-sources/mips-sources-2.6.29.1.ebuild fixed-mips-sources/mips-sources-2.6.29.1.ebuild
--- mips-sources/mips-sources-2.6.29.1.ebuild	2009-04-12 18:07:14.000000000 -0700
+++ fixed-mips-sources/mips-sources-2.6.29.1.ebuild	2010-01-10 01:29:04.000000000 -0800
@@ -137,24 +137,32 @@
 
 #//------------------------------------------------------------------------------
 
-# All are in ${FILESDIR}/eblits
-# If a message for a given machine needs to change,
-# then we create a new eblit and increment the
-# version and reference it here.
-eblit-include err_disabled_mach v1
-eblit-include err_only_one_mach_allowed v1
-eblit-include show_ip22_info v1
-eblit-include show_ip27_info v1
-eblit-include show_ip28_info v1
-eblit-include show_ip30_info v1
-eblit-include show_ip32_info v1
-eblit-include show_cobalt_info v1
+load_eblit_funcs() {
+    # All are in ${FILESDIR}/eblits
+    # If a message for a given machine needs to change,
+    # then we create a new eblit and increment the
+    # version and reference it here.
+    [ -n "${MIPS_SOURCES_EBLITS_LOADED}" ] && return
+    eblit-include err_disabled_mach v1
+    eblit-include err_only_one_mach_allowed v1
+    eblit-include show_ip22_info v1
+    eblit-include show_ip27_info v1
+    eblit-include show_ip28_info v1
+    eblit-include show_ip30_info v1
+    eblit-include show_ip32_info v1
+    eblit-include show_cobalt_info v1
 
-# This makes sure pkg_setup & pkg_postinst gets into any binpkg.
-# Neccessary because we can't guarantee FILESDIR is around for binpkgs.
-eblit-pkg setup v1
-eblit-pkg postinst v1
+    # This makes sure pkg_setup & pkg_postinst gets into any binpkg.
+    # Neccessary because we can't guarantee FILESDIR is around for binpkgs.
+    eblit-pkg setup v1
+    eblit-pkg postinst v1
+    MIPS_SOURCES_EBLITS_LOADED=1
+}
 
+pkg_setup() {
+    load_eblit_funcs
+    pkg_setup
+}
 src_unpack() { eblit-run src_unpack v2 ; }
 
 #//------------------------------------------------------------------------------