mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 18:58:08 -07:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
36 lines
930 B
Diff
36 lines
930 B
Diff
# Patch by Sergei Trofimovich
|
|
# http://bugs.gentoo.org/364697
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index bbe3b60..b4245af 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -138,10 +138,10 @@ distclean: clean
|
|
find . -name \*~ | xargs rm -f
|
|
|
|
lib/%:
|
|
- make -C lib $* CPPFLAGS="$(CPPFLAGS)" TESTING="$(TESTING)"
|
|
+ make -C lib $* CPPFLAGS="$(CPPFLAGS) -D__KERNEL__" TESTING="$(TESTING)"
|
|
|
|
tools/%:
|
|
- make -C tools $* CPPFLAGS="$(CPPFLAGS)"
|
|
+ make -C tools $* CPPFLAGS="$(CPPFLAGS) -U__KERNEL__"
|
|
|
|
sdisklabel/%:
|
|
make -C sdisklabel $* CPPFLAGS="$(CPPFLAGS)"
|
|
diff --git a/include/isolib.h b/include/isolib.h
|
|
index 392327a..0ef6e2a 100644
|
|
--- a/include/isolib.h
|
|
+++ b/include/isolib.h
|
|
@@ -7,7 +7,10 @@
|
|
# define fd_set kernel_fd_set
|
|
#endif
|
|
|
|
+#ifdef __KERNEL__
|
|
+/* userspace stuff has it's own struct stat */
|
|
#include <asm/stat.h>
|
|
+#endif
|
|
|
|
extern int iso_read_super (void * data, int quiet);
|
|
extern int iso_open (const char * filename);
|