Index: branches/ErmaC/Trunk/i386/libsaio/ati.c
===================================================================
--- branches/ErmaC/Trunk/i386/libsaio/ati.c (revision 1665)
+++ branches/ErmaC/Trunk/i386/libsaio/ati.c (revision 1666)
@@ -559,7 +559,7 @@
{ 0x6718, 0x31301682, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970", kNull },
- { 0x6720, 0x04BA1028, CHIP_FAMILY_CAYMAN, "AMD Radeon HD 6970m", kElodea }, // ErmaC no tested
+ { 0x6720, 0x04BA1028, CHIP_FAMILY_BARTS, "AMD Radeon HD 6970m", kElodea }, // ErmaC no tested
{ 0x6738, 0x00D01002, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed },
{ 0x6738, 0x21FA1002, CHIP_FAMILY_BARTS, "AMD Radeon HD 6870", kDuckweed },
Index: branches/ErmaC/Trunk/package/slimpkg.sh
===================================================================
--- branches/ErmaC/Trunk/package/slimpkg.sh (revision 1665)
+++ branches/ErmaC/Trunk/package/slimpkg.sh (revision 1666)
@@ -88,6 +88,31 @@
buildpackage "${1}/Core" "/" "0" "start_visible=\"false\" start_selected=\"true\"" >/dev/null 2>&1
# End build core package
+# build install type
+ echo "================= Chameleon ================="
+ outline[$((outlinecount++))]="${indent[$xmlindent]}"
+ choices[$((choicescount++))]="\t\n\t\n"
+ ((xmlindent++))
+ packagesidentity="org.chameleon.type"
+
+ # build new install package
+ mkdir -p ${1}/New/Root
+ echo "" > "${1}/New/Root/install_type_new"
+ echo " [BUILD] New "
+ buildpackage "${1}/New" "/$chamTemp" "" "start_enabled=\"true\" selected=\"exclusive(choices['Upgrade'])\"" >/dev/null 2>&1
+ # End build new install package
+
+ # build upgrade package
+ mkdir -p ${1}/Upgrade/Root
+ echo "" > "${1}/Upgrade/Root/install_type_upgrade"
+ echo " [BUILD] Upgrade "
+ buildpackage "${1}/Upgrade" "/$chamTemp" "" "start_selected=\"false\" selected=\"exclusive(choices['New'])\"" >/dev/null 2>&1
+ # End build upgrade package
+
+ ((xmlindent--))
+ outline[$((outlinecount++))]="${indent[$xmlindent]}"
+# End build install type
+
# build Chameleon package
echo "================= Chameleon ================="
outline[$((outlinecount++))]="${indent[$xmlindent]}"
Index: branches/ErmaC/Trunk/package/Resources/zh_TW.lproj/Localizable.strings
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/ErmaC/Trunk/package/Resources/zh_CN.lproj/Localizable.strings
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/ErmaC/Trunk/package/buildpkg.sh
===================================================================
--- branches/ErmaC/Trunk/package/buildpkg.sh (revision 1665)
+++ branches/ErmaC/Trunk/package/buildpkg.sh (revision 1666)
@@ -340,11 +340,11 @@
# build meta package
- makedistribution "${1}" "${2}" "${3}" "${4}" #"${5}"
+ makedistribution "${1}" "${2}" "${3}" "${4}" "${5}"
# clean up
- #rm -R -f "${1}"
+ rm -R -f "${1}"
}
@@ -472,7 +472,7 @@
header+="auth=\"root\">\n"
header+="\t\n"
- #rm -R -f "${1}/Temp"
+ rm -R -f "${1}/Temp"
[ -d "${1}/Temp" ] || mkdir -m 777 "${1}/Temp"
[ -d "${1}/Root" ] && mkbom "${1}/Root" "${1}/Temp/Bom"
@@ -507,7 +507,7 @@
local choiceoptions="\t\t${4}"
fi
choices[$((choicescount++))]="\t\n\t\t#${packagename// /}.pkg\n\t\n"
- #rm -R -f "${1}"
+ rm -R -f "${1}"
fi
}
@@ -588,5 +588,5 @@
}
-main "${1}" "${2}" "${3}" "${4}" #"${5}"
+main "${1}" "${2}" "${3}" "${4}" "${5}"
Index: branches/ErmaC/Modules/package/slimpkg.sh
===================================================================
--- branches/ErmaC/Modules/package/slimpkg.sh (revision 1665)
+++ branches/ErmaC/Modules/package/slimpkg.sh (revision 1666)
@@ -88,6 +88,31 @@
buildpackage "${1}/Core" "/" "0" "start_visible=\"false\" start_selected=\"true\"" >/dev/null 2>&1
# End build core package
+# build install type
+ echo "================= Chameleon ================="
+ outline[$((outlinecount++))]="${indent[$xmlindent]}"
+ choices[$((choicescount++))]="\t\n\t\n"
+ ((xmlindent++))
+ packagesidentity="org.chameleon.type"
+
+ # build new install package
+ mkdir -p ${1}/New/Root
+ echo "" > "${1}/New/Root/install_type_new"
+ echo " [BUILD] New "
+ buildpackage "${1}/New" "/$chamTemp" "" "start_enabled=\"true\" selected=\"exclusive(choices['Upgrade'])\"" >/dev/null 2>&1
+ # End build new install package
+
+ # build upgrade package
+ mkdir -p ${1}/Upgrade/Root
+ echo "" > "${1}/Upgrade/Root/install_type_upgrade"
+ echo " [BUILD] Upgrade "
+ buildpackage "${1}/Upgrade" "/$chamTemp" "" "start_selected=\"false\" selected=\"exclusive(choices['New'])\"" >/dev/null 2>&1
+ # End build upgrade package
+
+ ((xmlindent--))
+ outline[$((outlinecount++))]="${indent[$xmlindent]}"
+# End build install type
+
# build Chameleon package
echo "================= Chameleon ================="
outline[$((outlinecount++))]="${indent[$xmlindent]}"
Index: branches/ErmaC/Modules/package/Resources/zh_TW.lproj/Localizable.strings
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/ErmaC/Modules/package/Resources/zh_CN.lproj/Localizable.strings
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/ErmaC/Modules/package/buildpkg.sh
===================================================================
--- branches/ErmaC/Modules/package/buildpkg.sh (revision 1665)
+++ branches/ErmaC/Modules/package/buildpkg.sh (revision 1666)
@@ -380,11 +380,11 @@
# build meta package
- makedistribution "${1}" "${2}" "${3}" "${4}" #"${5}"
+ makedistribution "${1}" "${2}" "${3}" "${4}" "${5}"
# clean up
- #rm -R -f "${1}"
+ rm -R -f "${1}"
}
@@ -512,7 +512,7 @@
header+="auth=\"root\">\n"
header+="\t\n"
- #rm -R -f "${1}/Temp"
+ rm -R -f "${1}/Temp"
[ -d "${1}/Temp" ] || mkdir -m 777 "${1}/Temp"
[ -d "${1}/Root" ] && mkbom "${1}/Root" "${1}/Temp/Bom"
@@ -547,7 +547,7 @@
local choiceoptions="\t\t${4}"
fi
choices[$((choicescount++))]="\t\n\t\t#${packagename// /}.pkg\n\t\n"
- #rm -R -f "${1}"
+ rm -R -f "${1}"
fi
}
@@ -628,5 +628,5 @@
}
-main "${1}" "${2}" "${3}" "${4}" #"${5}"
+main "${1}" "${2}" "${3}" "${4}" "${5}"