diff options
| -rw-r--r-- | BUILD.Linux/dmidecode.spec | 3 | ||||
| -rw-r--r-- | dmidecode.makefile (renamed from Makefile) | 29 | ||||
| -rw-r--r-- | doc/README.types | 55 | ||||
| -rw-r--r-- | doc/changelog | 5 | ||||
| -rw-r--r-- | private/mem-001 | bin | 0 -> 2226 bytes |
5 files changed, 75 insertions, 17 deletions
diff --git a/BUILD.Linux/dmidecode.spec b/BUILD.Linux/dmidecode.spec index 43c98a5..2474e61 100644 --- a/BUILD.Linux/dmidecode.spec +++ b/BUILD.Linux/dmidecode.spec @@ -8,12 +8,13 @@ Summary: Python wrapper around dmidecode Name: %{name} Version: %{version} Release: %{release}.%{dist} +Requires: redhat-lsb Source: %{shortname}-%{unmangled_version}.tar.gz License: GNU GPL v3 Group: Development/Libraries BuildRoot: %{_tmppath}/%{shortname}-buildroot Prefix: %{_prefix} -Vendor: Nima Talebi, Joel Heenan, Vaughan Whitteron <dmidecode-devel@autonojects.net.au> +Vendor: Autonomy <dmidecode-devel@autonojects.net.au> BuildRequires: python-devel Url: http://projects.autonomy.net.au/dmidecode/ diff --git a/Makefile b/dmidecode.makefile index 6da92fc..f4c9645 100644 --- a/Makefile +++ b/dmidecode.makefile @@ -7,6 +7,7 @@ #. PY := $(shell python -V 2>&1 |sed -e 's/.\(ython\) \(2\.[0-9]\)\..*/p\1\2/') +PY_VER = $(shell python -c 'import sys;print(sys.version[0:3])') CC := gcc RM := rm -f SRC_D := src @@ -23,7 +24,7 @@ CFLAGS += -O3 #LDFLAGS = -lefence LDFLAGS = SOFLAGS = -pthread -shared -L/home/nima/dev-room/projects/dmidecode -lutil -SO = /usr/lib/$(PY)/site-packages/dmidecode.so +SO = build/lib.linux-$(shell uname -m)-$(PY_VER)/dmidecode.so #. Search vpath %.o $(OBJ_D) @@ -32,34 +33,30 @@ vpath %.h $(SRC_D) vpath % $(OBJ_D) ############################################################################### -install: build - $(PY) src/setup.py install +build: dmidecode.so +dmidecode.so: $(SO) + cp $< . -build: +$(SO): $(PY) src/setup.py build - ############################################################################### -SO: libdmidecode.so - cp $< $@ - nm -u $@ - libdmidecode.so: dmihelper.o util.o dmioem.o dmidecode.o dmidecodemodule.o $(CC) $(LDFLAGS) $(SOFLAGS) $^ -o $@ -dmidecodemodule.o: dmidecodemodule.c +$(OBJ_D)/dmidecodemodule.o: dmidecodemodule.c $(CC) $(CFLAGS) -c -o $@ $< -dmidecode.o: dmidecode.c version.h types.h util.h config.h dmidecode.h dmioem.h +$(OBJ_D)/dmidecode.o: dmidecode.c version.h types.h util.h config.h dmidecode.h dmioem.h $(CC) $(CFLAGS) -c -o $@ $< -dmihelper.o: dmihelper.c dmihelper.h +$(OBJ_D)/dmihelper.o: dmihelper.c dmihelper.h $(CC) $(CFLAGS) -c -o $@ $< -util.o: util.c types.h util.h config.h +$(OBJ_D)/util.o: util.c types.h util.h config.h $(CC) $(CFLAGS) -c -o $@ $< -dmioem.o: dmioem.c types.h dmidecode.h dmioem.h +$(OBJ_D)/dmioem.o: dmioem.c types.h dmidecode.h dmioem.h $(CC) $(CFLAGS) -c -o $@ $< @@ -70,7 +67,7 @@ uninstall: clean : $(PY) src/setup.py clean - -$(RM) lib/*.so lib/*.o core + -$(RM) *.so lib/*.o core -rm -rf build -.PHONY: install clean uninstall module +.PHONY: install clean uninstall module build diff --git a/doc/README.types b/doc/README.types new file mode 100644 index 0000000..5d65a3a --- /dev/null +++ b/doc/README.types @@ -0,0 +1,55 @@ + Type Information + ---------------------------------------- + 0 BIOS + 1 System + 2 Base Board + 3 Chassis + 4 Processor + 5 Memory Controller + 6 Memory Module + 7 Cache + 8 Port Connector + 9 System Slots + 10 On Board Devices + 11 OEM Strings + 12 System Configuration Options + 13 BIOS Language + 14 Group Associations + 15 System Event Log + 16 Physical Memory Array + 17 Memory Device + 18 32-bit Memory Error + 19 Memory Array Mapped Address + 20 Memory Device Mapped Address + 21 Built-in Pointing Device + 22 Portable Battery + 23 System Reset + 24 Hardware Security + 25 System Power Controls + 26 Voltage Probe + 27 Cooling Device + 28 Temperature Probe + 29 Electrical Current Probe + 30 Out-of-band Remote Access + 31 Boot Integrity Services + 32 System Boot + 33 64-bit Memory Error + 34 Management Device + 35 Management Device Component + 36 Management Device Threshold Data + 37 Memory Channel + 38 IPMI Device + 39 Power Supply + + + Keyword Types + ------------------------------ + bios 0, 13 + system 1, 12, 15, 23, 32 + baseboard 2, 10 + chassis 3 + processor 4 + memory 5, 6, 16, 17 + cache 7 + connector 8 + slot 9 diff --git a/doc/changelog b/doc/changelog new file mode 100644 index 0000000..664841a --- /dev/null +++ b/doc/changelog @@ -0,0 +1,5 @@ +dmidecode (0.1) unstable; urgency=low + + * Initial release. + + -- Nima Talebi <nima@autonomy.net.au> Wed, 17 Dec 2008 19:11:34 +0900 diff --git a/private/mem-001 b/private/mem-001 Binary files differnew file mode 100644 index 0000000..76e659d --- /dev/null +++ b/private/mem-001 |