Changeset 3494 for trunk

Timestamp:

Jun 19, 2007, 1:17:22 AM (18 years ago)

Author:

bird

Message:

Applied OS/2 patches (manually).

Location:

trunk/essentials/sys-apps/prefix-portage

Files:

• bin/ebuild.sh (modified) (4 diffs)
• bin/prepstrip (modified) (1 diff)
• pym/emerge/__init__.py (modified) (1 diff)
• pym/portage/const.py (modified) (1 diff)
• pym/portage/process.py (modified) (3 diffs)
• pym/portage/util.py (modified) (1 diff)
• src/tbz2tool.c (modified) (6 diffs)

trunk/essentials/sys-apps/prefix-portage/bin/ebuild.sh

@@ -23 +23 @@
                 source "${T}/environment" >& /dev/null
         fi
+fi
+
+PATH_SEP="@PATH_SEPARATOR@"
+if [ "${PATH_SEP}" = "@"PATH_SEPARATOR$"@" ]; then
+    PATH_SEP=":"
 fi
 
@@ -65 +70 @@
 unset GZIP BZIP BZIP2 CDPATH GREP_OPTIONS GREP_COLOR GLOBIGNORE
 
-export PATH="${DEFAULT_PATH}:${PORTAGE_BIN_PATH}:${ROOTPATH}"
-[ ! -z "$PREROOTPATH" ] && export PATH="${PREROOTPATH%%:}:$PATH"
+# bird: kNIX requires ';' and the old PATH to work right. The latter is 
+#       because the gcc and other toolchain programs initially are 
+#       installed outside the kNIX penthouse.
+if [ "${EPREFIX}" != "/" -o "{PPATH_SEP}" != ":" ]; then 
+    export PATH="${DEFAULT_PATH}${PATH_SEP}${PORTAGE_BIN_PATH}${PATH_SEP}${ROOTPATH}${PATH_SEP}${PATH}"
+else
+    export PATH="${DEFAULT_PATH}${PATH_SEP}${PORTAGE_BIN_PATH}${PATH_SEP}${ROOTPATH}"
+fi
+[ ! -z "$PREROOTPATH" ] && export PATH="${PREROOTPATH%%:}${PATH_SEP}$PATH"
 
 source "@PORTAGE_BASE@"/bin/isolated-functions.sh &>/dev/null
@@ -1363 +1375 @@
                                 remove_path_entry "distcc"
                         fi
-                        export PATH="${EPREFIX}/usr/lib/distcc/bin:${PATH}"
+                        export PATH="${EPREFIX}/usr/lib/distcc/bin${PATH_SEP}${PATH}"
                         [ ! -z "${DISTCC_LOG}" ] && addwrite "$(dirname ${DISTCC_LOG})"
                 elif which distcc &>/dev/null; then
@@ -1383 +1395 @@
 
                 if [ -d "${EPREFIX}"/usr/lib/ccache/bin ]; then
-                        export PATH="${EPREFIX}/usr/lib/ccache/bin:${PATH}"
+                        export PATH="${EPREFIX}/usr/lib/ccache/bin${PATH_SEP}${PATH}"
                 elif [ -d "${EPREFIX}"/usr/bin/ccache ]; then
-                        export PATH="${EPREFIX}/usr/bin/ccache:${PATH}"
+                        export PATH="${EPREFIX}/usr/bin/ccache${PATH_SEP}${PATH}"
                 fi
 

trunk/essentials/sys-apps/prefix-portage/bin/prepstrip

@@ -3 +3 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
+
+# bird: We shouldn't get here on OS/2, but if we do make 
+#       sure we quit immediately. (for now, anyway)
+case "${BASH_VERSINFO[5]}" in
+    *-os2*) exit 0 
+        ;;
+esac    
 
 source "${PORTAGE_BIN_PATH:-${EPREFIX}/usr/lib/portage/bin}"/isolated-functions.sh

trunk/essentials/sys-apps/prefix-portage/pym/emerge/__init__.py

@@ -216 +216 @@
                 file_path = EPREFIX+"/var/log/emerge.log"
                 mylogfile = open(file_path, "a")
+                if sys.platform == "os2knix":           # bird: chmod doesn't work if the file is open.
+                        mylogfile.close();              #       So, close it while applying permissions.
                 portage.util.apply_secpass_permissions(file_path,
                         uid=portage.portage_uid, gid=portage.portage_gid,
                         mode=0660)
+                if sys.platform == "os2knix":       # bird: see above
+                        mylogfile = open(file_path, "a")#
                 mylock = None
                 try:

trunk/essentials/sys-apps/prefix-portage/pym/portage/const.py

@@ -67 +67 @@
 
 MANIFEST2_IDENTIFIERS = ["AUX","MISC","DIST","EBUILD"]
+
+# bird: drop RMD160 and SHA1 until we get dev-python/pycrypto up and going.
+if sys.platform == "os2knix":
+        MANIFEST1_HASH_FUNCTIONS = ["MD5"]
+        MANIFEST2_HASH_FUNCTIONS = ["SHA1"]
+
 # ===========================================================================
 # END OF CONSTANTS -- END OF CONSTANTS -- END OF CONSTANTS -- END OF CONSTANT

trunk/essentials/sys-apps/prefix-portage/pym/portage/process.py

@@ -169 +169 @@
             or not os.access(binary, os.X_OK)):
                 binary = path_lookup and find_binary(binary) or None
+                # bird: try with exe suffix appended
+                if not binary and sys.platform == "os2knix":
+                        binary = mycommand[0]+".exe"
+                        if (not os.path.isabs(binary) or not os.path.isfile(binary)
+                                or not os.access(binary, os.X_OK)):
+                                binary = None
                 if not binary:
                         raise CommandNotFound(mycommand[0])
@@ -334 +340 @@
                 pre_exec()
 
+        # bird: hack. OS/2 and kLIBC dislike empty environments. (FIXME)
+        if len(env) == 0 and sys.platform == "os2knix":
+                env = os.environ.copy()
+
         # And switch to the new process.
         os.execve(binary, myargs, env)
@@ -346 +356 @@
         @returns: full path to binary or None if the binary could not be located.
         """
-        
-        for path in os.getenv("PATH", "").split(":"):
+
+        # bird: OS/2 uses ';' not ':'.
+        sep = "@PATH_SEPARATOR@"
+        if sep == "@"+"PATH_SEPARATOR"+"@":
+                sep = ":"
+
+        for path in os.getenv("PATH", "").split(sep):
                 filename = "%s/%s" % (path, binary)
                 if os.access(filename, os.X_OK) and os.path.isfile(filename):

trunk/essentials/sys-apps/prefix-portage/pym/portage/util.py

@@ -38 +38 @@
         We dislike this behavior so we create our own normpath func
         to fix it.
+        This doesn't apply to OS/2 kNIX where "//foo/bar" differs
+        from "/foo/bar" in that the former is a UNC path while the 
+        later is a local path.
         """
-        if mypath.startswith(os.path.sep):
+        if mypath.startswith(os.path.sep) and sys.platform != "os2knix"::
                 # posixpath.normpath collapses 3 or more leading slashes to just 1.
                 return os.path.normpath(2*os.path.sep + mypath)

trunk/essentials/sys-apps/prefix-portage/src/tbz2tool.c

@@ -99 +99 @@
                 
                 /* open datafile for reading */
-                if ((datafile=fopen(argv[2],"r"))==NULL) {
+                if ((datafile=fopen(argv[2],"rb"))==NULL) {
                         free(mybuf);
                         free(mystat);
@@ -107 +107 @@
                 
                 /* open dbfile for reading */
-                if ((dbfile=fopen(argv[3],"r"))==NULL) {
+                if ((dbfile=fopen(argv[3],"rb"))==NULL) {
                         fclose(datafile);
                         free(mybuf);
@@ -116 +116 @@
         
                 /* open outfile for writing */
-                if ((outfile=fopen(argv[4],"a"))==NULL) {
+                if ((outfile=fopen(argv[4],"ab"))==NULL) {
                         fclose(dbfile);
                         fclose(datafile);
@@ -158 +158 @@
         
                 /* open infile for reading */
-                if ((infile=fopen(argv[2],"r"))==NULL) {
+                if ((infile=fopen(argv[2],"rb"))==NULL) {
                         free(mybuf);
                         free(mystat);
@@ -184 +184 @@
                 
                 /* open datafile for writing */
-                if ((datafile=fopen(argv[3],"a"))==NULL) {
+                if ((datafile=fopen(argv[3],"ab"))==NULL) {
                         fclose(infile);
                         free(mybuf);
@@ -193 +193 @@
         
                 /* open dbfile for writing */
-                if ((dbfile=fopen(argv[4],"a"))==NULL) {
+                if ((dbfile=fopen(argv[4],"ab"))==NULL) {
                         fclose(datafile);
                         fclose(infile);