Index: trunk/package/Resources/templates/Localizable.strings
===================================================================
--- trunk/package/Resources/templates/Localizable.strings	(revision 2109)
+++ trunk/package/Resources/templates/Localizable.strings	(revision 2110)
@@ -60,6 +60,18 @@
 Source: http://cxx.uclibc.org/
 Dependencies: klibc";
 
+"KernelPatcher_title" = "Kernel Patcher";
+"KernelPatcher_description" = "The KernelPatcher module provides patches for the following:
+Enables the use of the kernelcache with /Extra/Extensions and /Extra/Extensions.mkext
+Removed the CPUID check
+Removes an LAPIC panic
+Removes a panic in commpage_stuff_routine
+Dependencies: none";
+
+"KextPatcher_title" = "Kext Patcher";
+"KernelPatcher_description" = "The KextPatcher module provides patches for the following:
+Dependencies: none";
+
 // ============================================================================
 // Boot Options - The follow options are split to match the layout OptionalSettings text files.
 // but they can be changed to suit however anyone wants to do it.
Index: trunk/package/buildpkg.sh
===================================================================
--- trunk/package/buildpkg.sh	(revision 2109)
+++ trunk/package/buildpkg.sh	(revision 2110)
@@ -521,23 +521,25 @@
     ###############################
     # Supported Modules           #
     ###############################
+    # ACPICodec.dylib             #
+    # KernelPatcher.dylib         #
+    # KextPatcher.dylib           #
+    # Keylayout.dylib             #
     # klibc.dylib                 #
     # Resolution.dylib            #
+    # Sata.dylib                  #
     # uClibcxx.dylib              #
-    # Sata.dylib                  #
-    # ACPICodec.dylib             #
-    # Keylayout.dylib             #
     ###############################
     if [ "$(ls -A "${SYMROOT}/i386/modules")" ]; then
     {
         addGroupChoices "Module"
 
 # -
-        if [[ "${CONFIG_RESOLUTION_MODULE}" == 'm' && -f "${SYMROOT}/i386/modules/Resolution.dylib" ]]; then
+        if [[ "${CONFIG_ACPICODEC_MODULE}" == 'm' && -f "${SYMROOT}/i386/modules/ACPICodec.dylib" ]]; then
         {
-            # Start build Resolution package module
-            choiceId="AutoReso"
-            moduleFile="Resolution.dylib"
+            # Start build ACPICodec package module
+            choiceId="ACPICodec"
+            moduleFile="ACPICodec.dylib"
             mkdir -p "${PKG_BUILD_DIR}/${choiceId}/Root"
             ditto --noextattr --noqtn "${SYMROOT}/i386/modules/$moduleFile" "${PKG_BUILD_DIR}/${choiceId}/Root"
             addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/${choiceId}" \
@@ -548,11 +550,83 @@
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
             buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/Extra/modules"
             addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"
-            # End build Resolution package module
+            # End build ACPICodec package module
         }
         fi
+# -
+        if [[ "${CONFIG_RESOLUTION_MODULE}" == 'm' && -f "${SYMROOT}/i386/modules/KernelPatcher.dylib" ]]; then
+        {
+            # Start build KernelPatcher package module
+            choiceId="KernelPatcher"
+            moduleFile="KernelPatcher.dylib"
+            mkdir -p "${PKG_BUILD_DIR}/${choiceId}/Root"
+            ditto --noextattr --noqtn "${SYMROOT}/i386/modules/$moduleFile" "${PKG_BUILD_DIR}/${choiceId}/Root"
+            addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/${choiceId}" \
+                               --subst="moduleName=$choiceId"               \
+                               --subst="moduleFile=$moduleFile"             \
+                               InstallModule
 
+            packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
+            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/Extra/modules"
+            addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"
+            # End build KernelPatcher package module
+        }
+        fi
 # -
+        if [[ "${CONFIG_RESOLUTION_MODULE}" == 'm' && -f "${SYMROOT}/i386/modules/KextPatcher.dylib" ]]; then
+        {
+            # Start build KextPatcher package module
+            choiceId="KextPatcher"
+            moduleFile="KextPatcher.dylib"
+            mkdir -p "${PKG_BUILD_DIR}/${choiceId}/Root"
+            ditto --noextattr --noqtn "${SYMROOT}/i386/modules/$moduleFile" "${PKG_BUILD_DIR}/${choiceId}/Root"
+            addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/${choiceId}" \
+                               --subst="moduleName=$choiceId"               \
+                               --subst="moduleFile=$moduleFile"             \
+                               InstallModule
+
+            packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
+            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/Extra/modules"
+            addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"
+            # End build KextPatcher package module
+        }
+        fi
+# -
+        # Warning Keylayout module need additional files
+        if [[ "${CONFIG_KEYLAYOUT_MODULE}" = 'm' && -f "${SYMROOT}/i386/modules/Keylayout.dylib" ]]; then
+        {
+            # Start build Keylayout package module
+            choiceId="Keylayout"
+            moduleFile="${choiceId}.dylib"
+            mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root/Extra/{modules,Keymaps}
+            mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root/usr/local/bin
+            layout_src_dir="${SRCROOT}/i386/modules/Keylayout/layouts/layouts-src"
+            if [ -d "$layout_src_dir" ];then
+                # Create a tar.gz from layout sources
+                (cd "$layout_src_dir"; \
+                    tar czf "${PKG_BUILD_DIR}/${choiceId}/Root/Extra/Keymaps/layouts-src.tar.gz" README *.slt)
+            fi
+            # Adding module
+            ditto --noextattr --noqtn ${SYMROOT}/i386/modules/$moduleFile ${PKG_BUILD_DIR}/${choiceId}/Root/Extra/modules
+            # Adding Keymaps
+            ditto --noextattr --noqtn ${SRCROOT}/Keymaps ${PKG_BUILD_DIR}/${choiceId}/Root/Extra/Keymaps
+            # Adding tools
+            ditto --noextattr --noqtn ${SYMROOT}/i386/cham-mklayout ${PKG_BUILD_DIR}/${choiceId}/Root/usr/local/bin
+            # Adding scripts
+            addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/${choiceId}" \
+                               --subst="moduleName=$choiceId"               \
+                               --subst="moduleFile=$moduleFile"             \
+                               InstallModule
+
+            packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
+            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"
+
+            # Don't add a choice for Keylayout module
+            # addChoice "${choiceId}" "Module" --start-selected="false"  "$packageRefId"
+            # End build Keylayout package module
+        }
+        fi
+# -
         if [[ "${CONFIG_KLIBC_MODULE}" == 'm' && -f "${SYMROOT}/i386/modules/klibc.dylib" ]]; then
         {
             # Start build klibc package module
@@ -571,18 +645,12 @@
             # End build klibc package module
         }
         fi
-
 # -
-        if [[ "${CONFIG_UCLIBCXX_MODULE}" = 'm' && -n "${CONFIG_KLIBC_MODULE}" && \
-              -f "${SYMROOT}/i386/modules/uClibcxx.dylib" ]]; then
+        if [[ "${CONFIG_RESOLUTION_MODULE}" == 'm' && -f "${SYMROOT}/i386/modules/Resolution.dylib" ]]; then
         {
-            klibcPackageRefId=""
-            if [[ "${CONFIG_KLIBC_MODULE}" == 'm' ]];then
-                klibcPackageRefId=$(getPackageRefId "${modules_packages_identity}" "klibc")
-            fi
-            # Start build uClibc package module
-            choiceId="uClibc"
-            moduleFile="uClibcxx.dylib"
+            # Start build Resolution package module
+            choiceId="AutoReso"
+            moduleFile="Resolution.dylib"
             mkdir -p "${PKG_BUILD_DIR}/${choiceId}/Root"
             ditto --noextattr --noqtn "${SYMROOT}/i386/modules/$moduleFile" "${PKG_BUILD_DIR}/${choiceId}/Root"
             addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/${choiceId}" \
@@ -592,9 +660,8 @@
 
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
             buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/Extra/modules"
-            # Add the klibc package because the uClibc module is dependent of klibc module
-            addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId $klibcPackageRefId" "${choiceId}"
-            # End build uClibc package module
+            addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"
+            # End build Resolution package module
         }
         fi
 # -
@@ -616,13 +683,17 @@
             # End build Sata package module
         }
         fi
-
 # -
-        if [[ "${CONFIG_ACPICODEC_MODULE}" == 'm' && -f "${SYMROOT}/i386/modules/ACPICodec.dylib" ]]; then
+        if [[ "${CONFIG_UCLIBCXX_MODULE}" = 'm' && -n "${CONFIG_KLIBC_MODULE}" && \
+              -f "${SYMROOT}/i386/modules/uClibcxx.dylib" ]]; then
         {
-            # Start build ACPICodec package module
-            choiceId="ACPICodec"
-            moduleFile="ACPICodec.dylib"
+            klibcPackageRefId=""
+            if [[ "${CONFIG_KLIBC_MODULE}" == 'm' ]];then
+                klibcPackageRefId=$(getPackageRefId "${modules_packages_identity}" "klibc")
+            fi
+            # Start build uClibc package module
+            choiceId="uClibc"
+            moduleFile="uClibcxx.dylib"
             mkdir -p "${PKG_BUILD_DIR}/${choiceId}/Root"
             ditto --noextattr --noqtn "${SYMROOT}/i386/modules/$moduleFile" "${PKG_BUILD_DIR}/${choiceId}/Root"
             addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/${choiceId}" \
@@ -632,46 +703,12 @@
 
             packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
             buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/Extra/modules"
-            addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId" "${choiceId}"
-            # End build ACPICodec package module
+            # Add the klibc package because the uClibc module is dependent of klibc module
+            addChoice --group="Module"  --start-selected="false"  --pkg-refs="$packageRefId $klibcPackageRefId" "${choiceId}"
+            # End build uClibc package module
         }
         fi
-
-# -        # Warning Keylayout module need additional files
-        if [[ "${CONFIG_KEYLAYOUT_MODULE}" = 'm' && -f "${SYMROOT}/i386/modules/Keylayout.dylib" ]]; then
-        {
-            # Start build Keylayout package module
-            choiceId="Keylayout"
-            moduleFile="${choiceId}.dylib"
-            mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root/Extra/{modules,Keymaps}
-            mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Root/usr/local/bin
-            layout_src_dir="${SRCROOT}/i386/modules/Keylayout/layouts/layouts-src"
-            if [ -d "$layout_src_dir" ];then
-                # Create a tar.gz from layout sources
-                (cd "$layout_src_dir"; \
-                    tar czf "${PKG_BUILD_DIR}/${choiceId}/Root/Extra/Keymaps/layouts-src.tar.gz" README *.slt)
-            fi
-            # Adding module
-            ditto --noextattr --noqtn ${SYMROOT}/i386/modules/$moduleFile ${PKG_BUILD_DIR}/${choiceId}/Root/Extra/modules
-            # Adding Keymaps
-            ditto --noextattr --noqtn ${SRCROOT}/Keymaps ${PKG_BUILD_DIR}/${choiceId}/Root/Extra/Keymaps
-            # Adding tools
-            ditto --noextattr --noqtn ${SYMROOT}/i386/cham-mklayout ${PKG_BUILD_DIR}/${choiceId}/Root/usr/local/bin
-            # Adding scripts
-            addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/${choiceId}" \
-                               --subst="moduleName=$choiceId"               \
-                               --subst="moduleFile=$moduleFile"             \
-                               InstallModule
-
-            packageRefId=$(getPackageRefId "${modules_packages_identity}" "${choiceId}")
-            buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"
-
-            # Don't add a choice for Keylayout module
-            # addChoice "${choiceId}" "Module" --start-selected="false"  "$packageRefId"
-            # End build Keylayout package module
-        }
-        fi
-
+# -
     }
     else
     {