The package rpms/libx86.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/libx86.git/commit/?id=10ca62e97f2074....
Change: +ExcludeArch: ppc %{power64} s390 s390x %{sparc} aarch64 armv7hl
Thanks.
Full change: ============
commit 10ca62e97f2074fd3d3ed847a9b784d1ce965cff Author: Pat Riehecky riehecky@fnal.gov Date: Fri Feb 7 09:24:21 2020 -0600
Return to Fedora
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..023cd09 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +libx86-1.1.tar.gz diff --git a/dead.package b/dead.package deleted file mode 100644 index 5204a84..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -Orphaned for 6+ weeks diff --git a/libx86-add-pkgconfig.patch b/libx86-add-pkgconfig.patch new file mode 100644 index 0000000..3aeaff7 --- /dev/null +++ b/libx86-add-pkgconfig.patch @@ -0,0 +1,64 @@ +From fc4f25c4d16aaff7dcb5dd42cc20b292f4eb2218 Mon Sep 17 00:00:00 2001 +From: Dave Airlie airlied@redhat.com +Date: Tue, 4 Aug 2009 13:08:42 +1000 +Subject: [PATCH] git add x86.pc + +--- + Makefile | 15 ++++++++++++--- + x86.pc.in | 10 ++++++++++ + 2 files changed, 22 insertions(+), 3 deletions(-) + create mode 100644 x86.pc.in + +diff --git a/Makefile b/Makefile +index 951b617..953a499 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,6 +1,7 @@ + OBJECTS = x86-common.o + CFLAGS ?= -O2 -Wall -DDEBUG -g + LIBDIR ?= /usr/lib ++INCLUDEDIR ?= /usr/include + + ifeq ($(BACKEND),x86emu) + OBJECTS += thunk.o x86emu/decode.o x86emu/debug.o x86emu/fpu.o \ +@@ -29,10 +30,18 @@ objclean: + rm -f *.o *~ + + clean: objclean +- rm -f *.so.1 *.a ++ rm -f *.so.1 *.a x86.pc + +-install: libx86.so.1 ++x86.pc: ++ sed -e's,@prefix@,/usr,' x86.pc.in > x86.pc ++ sed -e's,@exec_prefix@,/usr,' -i x86.pc ++ sed -e's,@libdir@,${LIBDIR},' -i x86.pc ++ sed -e's,@includedir@,${INCLUDEDIR},' -i x86.pc ++ sed -e's,@PACKAGE_VERSION@,1.1,' -i x86.pc ++ ++install: libx86.so.1 x86.pc + install -D libx86.so.1 $(DESTDIR)$(LIBDIR)/libx86.so.1 + install -D libx86.a $(DESTDIR)$(LIBDIR)/libx86.a ++ install -D x86.pc $(DESTDIR)$(LIBDIR)/pkgconfig/x86.pc + ln -sf libx86.so.1 $(DESTDIR)$(LIBDIR)/libx86.so +- install -p -m 0644 -D lrmi.h $(DESTDIR)/usr/include/libx86.h ++ install -p -m 0644 -D lrmi.h $(DESTDIR)$(INCLUDEDIR)/libx86.h +diff --git a/x86.pc.in b/x86.pc.in +new file mode 100644 +index 0000000..711d90d +--- /dev/null ++++ b/x86.pc.in +@@ -0,0 +1,10 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: x86 ++Description: Library providing x86 emulator access ++Version: @PACKAGE_VERSION@ ++Cflags: -I${includedir} ++Libs: -L${libdir} -lx86 +-- +1.5.4.1 + diff --git a/libx86-libc-test.patch b/libx86-libc-test.patch new file mode 100644 index 0000000..a62da4a --- /dev/null +++ b/libx86-libc-test.patch @@ -0,0 +1,39 @@ +diff -Naur libx86-1.1+ds1.orig/Makefile libx86-1.1+ds1/Makefile +--- libx86-1.1+ds1.orig/Makefile 2008-05-19 12:28:59.000000000 +0300 ++++ libx86-1.1+ds1/Makefile 2012-02-20 01:32:03.750068423 +0200 +@@ -5,6 +5,7 @@ + ifeq ($(BACKEND),x86emu) + OBJECTS += thunk.o x86emu/decode.o x86emu/debug.o x86emu/fpu.o \ + x86emu/ops.o x86emu/ops2.o x86emu/prim_ops.o x86emu/sys.o ++ CFLAGS += -DX86EMU + else + OBJECTS += lrmi.o + endif +diff -Naur libx86-1.1+ds1.orig/thunk.c libx86-1.1+ds1/thunk.c +--- libx86-1.1+ds1.orig/thunk.c 2008-04-03 03:48:00.000000000 +0300 ++++ libx86-1.1+ds1/thunk.c 2012-02-20 01:12:56.468820192 +0200 +@@ -32,6 +32,7 @@ + #define TRUE 1 + #define FALSE 0 + ++#ifndef X86EMU + #define __BUILDIO(bwl,bw,type) \ + static inline void out##bwl##_local(unsigned long port, unsigned type value) { __asm__ __volatile__("out" #bwl " %" #bw "0, %w1" : : "a"(value), "Nd"(port)); \ + }\ +@@ -44,6 +45,15 @@ + __BUILDIO(b,b,char) + __BUILDIO(w,w,short) + __BUILDIO(l,,int) ++#else ++/* use libc functions */ ++#define inb_local inb ++#define inw_local inw ++#define inl_local inl ++#define outb_local outb ++#define outw_local outw ++#define outl_local outl ++#endif /* X86EMU */ + + + char *mmap_addr = SHMERRORPTR; + diff --git a/libx86-mmap-offset.patch b/libx86-mmap-offset.patch new file mode 100644 index 0000000..881bc66 --- /dev/null +++ b/libx86-mmap-offset.patch @@ -0,0 +1,187 @@ +diff -ur libx86-1.1/lrmi.c libx86-1.1.hack/lrmi.c +--- libx86-1.1/lrmi.c 2006-10-30 15:10:16.000000000 -0500 ++++ libx86-1.1.hack/lrmi.c 2009-10-26 15:55:42.000000000 -0400 +@@ -136,7 +136,7 @@ + if (context.ready) + return 1; + +- if (!LRMI_common_init()) ++ if (!LRMI_common_init(0)) + return 0; + + /* +diff -ur libx86-1.1/thunk.c libx86-1.1.hack/thunk.c +--- libx86-1.1/thunk.c 2008-04-02 20:48:00.000000000 -0400 ++++ libx86-1.1.hack/thunk.c 2009-10-26 16:05:39.000000000 -0400 +@@ -139,11 +139,11 @@ + int i; + X86EMU_intrFuncs intFuncs[256]; + +- if (!LRMI_common_init()) ++ mmap_addr = LRMI_common_init(1); ++ ++ if (!mmap_addr) + return 0; + +- mmap_addr = 0; +- + X86EMU_pioFuncs pioFuncs = { + (&x_inb), + (&x_inw), +@@ -169,10 +169,10 @@ + X86_ESP = 0xFFF9; + memset (stack, 0, 64*1024); + +- *((char *)0) = 0x4f; /* Make sure that we end up jumping back to a +- halt instruction */ ++ *mmap_addr = 0x4f; /* Make sure that we end up jumping back to a ++ halt instruction */ + +- M.mem_base = 0; ++ M.mem_base = (unsigned long)mmap_addr; + M.mem_size = 1024*1024; + + return 1; +diff -ur libx86-1.1/x86-common.c libx86-1.1.hack/x86-common.c +--- libx86-1.1/x86-common.c 2008-05-16 12:56:23.000000000 -0400 ++++ libx86-1.1.hack/x86-common.c 2009-10-26 16:03:21.000000000 -0400 +@@ -45,14 +45,15 @@ + static struct { + int ready; + int count; ++ void *offset; + struct mem_block blocks[REAL_MEM_BLOCKS]; + } mem_info = { 0 }; + + static int +-real_mem_init(void) ++real_mem_init(int high_page) + { + void *m; +- int fd_zero; ++ int fd_zero, flags = MAP_SHARED; + + if (mem_info.ready) + return 1; +@@ -63,9 +64,12 @@ + return 0; + } + ++ if (!high_page) ++ flags |= MAP_FIXED; ++ + m = mmap((void *)REAL_MEM_BASE, REAL_MEM_SIZE, +- PROT_READ | PROT_WRITE | PROT_EXEC, +- MAP_FIXED | MAP_SHARED, fd_zero, 0); ++ PROT_READ | PROT_WRITE | PROT_EXEC, ++ flags, fd_zero, 0); + + if (m == (void *)-1) { + perror("mmap /dev/zero"); +@@ -76,6 +80,7 @@ + close(fd_zero); + + mem_info.ready = 1; ++ mem_info.offset = m; + mem_info.count = 1; + mem_info.blocks[0].size = REAL_MEM_SIZE; + mem_info.blocks[0].free = 1; +@@ -87,7 +92,7 @@ + real_mem_deinit(void) + { + if (mem_info.ready) { +- munmap((void *)REAL_MEM_BASE, REAL_MEM_SIZE); ++ munmap(mem_info.offset, REAL_MEM_SIZE); + mem_info.ready = 0; + } + } +@@ -119,7 +124,7 @@ + LRMI_alloc_real(int size) + { + int i; +- char *r = (char *)REAL_MEM_BASE; ++ char *r = (char *)mem_info.offset; + + if (!mem_info.ready) + return NULL; +@@ -151,7 +156,7 @@ + LRMI_free_real(void *m) + { + int i; +- char *r = (char *)REAL_MEM_BASE; ++ char *r = (char *)mem_info.offset; + + if (!mem_info.ready) + return; +@@ -200,13 +205,15 @@ + return *(unsigned short *)(i * 4); + } + +-int LRMI_common_init(void) ++void *LRMI_common_init(int high_page) + { +- void *m; ++ void *m, *offset; + int fd_mem; + +- if (!real_mem_init()) +- return 0; ++ if (!real_mem_init(high_page)) ++ return NULL; ++ ++ offset = mem_info.offset - REAL_MEM_BASE; + + /* + Map the Interrupt Vectors (0x0 - 0x400) + BIOS data (0x400 - 0x502) +@@ -217,33 +224,33 @@ + if (fd_mem == -1) { + real_mem_deinit(); + perror("open /dev/mem"); +- return 0; ++ return NULL; + } + +- m = mmap((void *)0, 0x502, +- PROT_READ | PROT_WRITE | PROT_EXEC, +- MAP_FIXED | MAP_SHARED, fd_mem, 0); ++ m = mmap(offset, 0x502, ++ PROT_READ | PROT_WRITE | PROT_EXEC, ++ MAP_FIXED | MAP_SHARED, fd_mem, 0); + + if (m == (void *)-1) { + close(fd_mem); + real_mem_deinit(); + perror("mmap /dev/mem"); +- return 0; ++ return NULL; + } + +- m = mmap((void *)0xa0000, 0x100000 - 0xa0000, ++ m = mmap(offset+0xa0000, 0x100000 - 0xa0000, + PROT_READ | PROT_WRITE | PROT_EXEC, + MAP_FIXED | MAP_SHARED, fd_mem, 0xa0000); + + if (m == (void *)-1) { +- munmap((void *)0, 0x502); ++ munmap(offset, 0x502); + close(fd_mem); + real_mem_deinit(); + perror("mmap /dev/mem"); +- return 0; ++ return NULL; + } + + close(fd_mem); + +- return 1; ++ return offset; + } +diff -ur libx86-1.1/x86-common.h libx86-1.1.hack/x86-common.h +--- libx86-1.1/x86-common.h 2006-09-07 18:44:27.000000000 -0400 ++++ libx86-1.1.hack/x86-common.h 2009-10-26 16:01:19.000000000 -0400 +@@ -40,4 +40,4 @@ + + void *LRMI_alloc_real(int size); + void LRMI_free_real(void *m); +-int LRMI_common_init(void); ++void *LRMI_common_init(int high_page); diff --git a/libx86.spec b/libx86.spec new file mode 100644 index 0000000..e6b9b78 --- /dev/null +++ b/libx86.spec @@ -0,0 +1,149 @@ +Name: libx86 +Version: 1.1 +Release: 30%{?dist} +Summary: Library for making real-mode x86 calls + +License: MIT +URL: http://www.codon.org.uk/~mjg59/libx86 +Source0: http://www.codon.org.uk/~mjg59/libx86/downloads/%%7Bname%7D-%%7Bversion%7D.t... +# does not build on ppc, ppc64 and s390* yet, due to the lack of port i/o +# redirection and video routing +ExcludeArch: ppc %{power64} s390 s390x %{sparc} aarch64 armv7hl + +Patch0: libx86-add-pkgconfig.patch +Patch1: libx86-mmap-offset.patch +# patch from https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=34;filename=libx86-libc-te... +# debian control portion removed as it fails to apply and we do not need it anyway +Patch2: libx86-libc-test.patch + +BuildRequires: gcc +%description +A library to provide support for making real-mode x86 calls with an emulated +x86 processor. + +%package devel +Summary: Development tools for programs which will use libx86 +Requires: %{name} = %{version}-%{release} + +%description devel +This package contains the static library and header file necessary for +development of programs that will use libx86 to make real-mode x86 calls. + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 + + +%build +CFLAGS="$RPM_OPT_FLAGS" make BACKEND=x86emu LIBDIR=%{_libdir} %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} +rm $RPM_BUILD_ROOT/%{_libdir}/*.a + +%ldconfig_scriptlets + +%files +%doc COPYRIGHT +%{_libdir}/lib*.so.* + +%files devel +%{_libdir}/lib*.so +%{_includedir}/*.h +%{_libdir}/pkgconfig/x86.pc + +%changelog +* Thu Jul 25 2019 Fedora Release Engineering releng@fedoraproject.org - 1.1-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering releng@fedoraproject.org - 1.1-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering releng@fedoraproject.org - 1.1-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering releng@fedoraproject.org - 1.1-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering releng@fedoraproject.org - 1.1-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering releng@fedoraproject.org - 1.1-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering releng@fedoraproject.org - 1.1-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sun Aug 14 2016 Peter Robinson pbrobinson@fedoraproject.org 1.1-23 +- Update Power64 macro + +* Thu Feb 04 2016 Fedora Release Engineering releng@fedoraproject.org - 1.1-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 1.1-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Aug 17 2014 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 1.1-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Tue Jul 08 2014 Yaakov Selkowitz yselkowi@redhat.com - 1.1-19 +- ExcludeArch: aarch64 due to missing sys/io.h + +* Tue Jun 24 2014 Dennis Gilmore dennis@ausil.us - 1.1-18 +- add patch from debian for ftbfs + +* Sat Jun 07 2014 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 1.1-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 1.1-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sun Apr 14 2013 Matthew Garrett mjg59@srcf.ucam.org .1-15 +- Revert previous change + +* Sun Apr 14 2013 Peter Robinson pbrobinson@fedoraproject.org 1.1-14 +- Make ExclusiveArch x86 + +* Thu Feb 14 2013 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 1.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jul 19 2012 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 1.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 1.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Feb 08 2011 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 1.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Nov 04 2009 Dennis Gilmore dennis@ausil.us - 1.1-9 +- Exclude sparc arches + +* Tue Oct 27 2009 Adam Jackson ajax@redhat.com 1.1-8 +- libx86-mmap-offset.patch: Attempt to make selinux happy by not mmap'ing + the zero page. + +* Thu Sep 03 2009 Karsten Hopp karsten@redhat.com 1.1-7 +- excludearch s390, s390x where we don't have sys/io.h + +* Tue Aug 04 2009 Dave Airlie airlied@redhat.com 1.1-6 +- add pkgconfig support + +* Sat Jul 25 2009 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 1.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue May 20 2008 Matthew Garrett mjg@redhat.com 1.1-3 +- Fix bizarre provides/obsoletes thinko + +* Tue May 20 2008 Matthew Garrett mjg@redhat.com 1.1-2 +- Ensure RPM_OPT_FLAGS are passed. Patch from Till Maas. + +* Mon May 19 2008 Matthew Garrett mjg@redhat.com 1.1-1 +- Initial packaging of libx86 diff --git a/sources b/sources new file mode 100644 index 0000000..c3fd38c --- /dev/null +++ b/sources @@ -0,0 +1 @@ +41bee1f8e22b82d82b5f7d7ba51abc2a libx86-1.1.tar.gz
arch-excludes@lists.fedoraproject.org