RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 06-Jul-2007 21:34:44
Branch: HEAD Handle: 2007070620344301
Modified files:
rpm CHANGES
rpm/lib rpmlib.h rpmrc.c
rpm/python rpmmodule.c
Log:
- revert routines that were re-added for ABI compat after rpm-4.4.7.
Summary:
Revision Changes Path
1.1442 +1 -0 rpm/CHANGES
2.425 +0 -44 rpm/lib/rpmlib.h
2.204 +0 -47 rpm/lib/rpmrc.c
1.150 +1 -19 rpm/python/rpmmodule.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1441 -r1.1442 CHANGES
--- rpm/CHANGES 6 Jul 2007 19:14:46 -0000 1.1441
+++ rpm/CHANGES 6 Jul 2007 19:34:43 -0000 1.1442
@@ -1,4 +1,5 @@
4.5 -> 5.0:
+ - jbj: revert routines that were re-added for ABI compat after rpm-4.4.7.
- jbj: eliminate the voo-doo asm arch identification.
- jbj: eliminate recursive parser helpers.
- jbj: expunge every occurence of Rcfiles.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmlib.h
============================================================================
$ cvs diff -u -r2.424 -r2.425 rpmlib.h
--- rpm/lib/rpmlib.h 6 Jul 2007 18:45:53 -0000 2.424
+++ rpm/lib/rpmlib.h 6 Jul 2007 19:34:44 -0000 2.425
@@ -540,50 +540,6 @@
/[EMAIL PROTECTED] rpmGlobalMacroContext, rpmCLIMacroContext,
fileSystem, internalState @*/;
-/** \ingroup rpmrc
- * @deprecated Expand %{_host_cpu}/%{_target_cpu} for the canonical/current
cpu.
- * Return current arch name and/or number.
- * @todo Generalize to extract arch component from target_platform macro.
- * @retval name address of arch name (or NULL)
- * @retval num address of arch number (or NULL)
- */
-void rpmGetArchInfo( /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ const char
** name,
- /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ int * num)
- /[EMAIL PROTECTED] *name, *num @*/;
-
-/** \ingroup rpmrc
- * @deprecated Expand %{_host_os}/%{_target_os} for the canonical/current os.
- * Return current os name and/or number.
- * @todo Generalize to extract os component from target_platform macro.
- * @retval name address of os name (or NULL)
- * @retval num address of os number (or NULL)
- */
-void rpmGetOsInfo( /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ const char **
name,
- /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ int * num)
- /[EMAIL PROTECTED] *name, *num @*/;
-
-/** \ingroup rpmrc
- * @deprecated Use rpmPlatformScore instead.
- * Return arch/os score of a name.
- * An arch/os score measures the "nearness" of a name to the currently
- * running (or defined) platform arch/os. For example, the score of arch
- * "i586" on an i686 platform is (usually) 2. The arch/os score is used
- * to select one of several otherwise identical packages using the arch/os
- * tags from the header as hints of the intended platform for the package.
- *
- * @param type any of the RPM_MACHTABLE_* constants
- * @param name name
- * @return arch score (0 is no match, lower is preferred)
- */
-int rpmMachineScore(int type, const char * name)
- /[EMAIL PROTECTED]/;
-
-/**
- * (unused)
- */
-void rpmGetMachine(const char ** arch, const char ** os)
- /[EMAIL PROTECTED]/;
-
/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
extern void * platpat;
/[EMAIL PROTECTED]@*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmrc.c
============================================================================
$ cvs diff -u -r2.203 -r2.204 rpmrc.c
--- rpm/lib/rpmrc.c 6 Jul 2007 19:14:47 -0000 2.203
+++ rpm/lib/rpmrc.c 6 Jul 2007 19:34:44 -0000 2.204
@@ -55,13 +55,6 @@
machEquivInfo list;
} * machEquivTable;
-struct rpmvarValue {
- const char * value;
- /* eventually, this arch will be replaced with a generic condition */
- const char * arch;
-/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ struct rpmvarValue * next;
-};
-
typedef struct defaultEntry_s {
/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ const char * name;
/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ const char * defName;
@@ -129,19 +122,6 @@
return NULL;
}
-static /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ machEquivInfo
-machEquivSearch(const machEquivTable table, const char * name)
- /[EMAIL PROTECTED]/
-{
- int i;
-
- for (i = 0; i < table->count; i++)
- if (!xstrcasecmp(table->list[i].name, name))
- return table->list + i;
-
- return NULL;
-}
-
static void machAddEquiv(machEquivTable table, const char * name,
int distance)
/[EMAIL PROTECTED] table->list, table->count @*/
@@ -622,23 +602,6 @@
}
}
-int rpmMachineScore(int type, const char * name)
-{
- machEquivInfo info = machEquivSearch(&tables[type].equiv, name);
- return (info != NULL ? info->score : 0);
-}
-
-/[EMAIL PROTECTED]@*/
-void rpmGetMachine(const char ** arch, const char ** os)
-{
- if (arch)
- *arch = current[ARCH];
-
- if (os)
- *os = current[OS];
-}
-/[EMAIL PROTECTED]@*/
-
void rpmSetMachine(const char * arch, const char * os)
/[EMAIL PROTECTED] current @*/
/[EMAIL PROTECTED] current @*/
@@ -701,16 +664,6 @@
}
}
-void rpmGetArchInfo(const char ** name, int * num)
-{
- getMachineInfo(ARCH, name, num);
-}
-
-void rpmGetOsInfo(const char ** name, int * num)
-{
- getMachineInfo(OS, name, num);
-}
-
static void rpmRebuildTargetVars(const char ** target, const char **
canontarget)
{
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/rpmmodule.c
============================================================================
$ cvs diff -u -r1.149 -r1.150 rpmmodule.c
--- rpm/python/rpmmodule.c 5 Jul 2007 21:59:06 -0000 1.149
+++ rpm/python/rpmmodule.c 6 Jul 2007 19:34:44 -0000 1.150
@@ -41,23 +41,8 @@
*/
PyObject * pyrpmError;
-/**
- */
-static PyObject * archScore(PyObject * self, PyObject * args, PyObject *
kwds)
-{
- char * arch;
- int score;
- char * kwlist[] = {"arch", NULL};
-
- if (!PyArg_ParseTupleAndKeywords(args, kwds, "s", kwlist, &arch))
- return NULL;
-
- score = rpmMachineScore(RPM_MACHTABLE_INSTARCH, arch);
-
- return Py_BuildValue("i", score);
-}
-
extern sigset_t rpmsqCaught;
+
/**
*/
static PyObject * sqCaught(PyObject * self, PyObject * args)
@@ -164,9 +149,6 @@
{ "delMacro", (PyCFunction) rpmrc_DelMacro, METH_VARARGS|METH_KEYWORDS,
NULL },
- { "archscore", (PyCFunction) archScore, METH_VARARGS|METH_KEYWORDS,
- NULL },
-
{ "sqCaught", (PyCFunction) sqCaught, METH_VARARGS,
NULL },
{ "checkSignals", (PyCFunction) checkSignals, METH_VARARGS,
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
