]>
Commit | Line | Data |
---|---|---|
0a93a495 JB |
1 | --- Firebird-2.5.0.26074-0/builds/install/arch-specific/linux/misc/makeInstallImage.sh.in.orig 2010-09-08 10:41:27.000000000 +0200 |
2 | +++ Firebird-2.5.0.26074-0/builds/install/arch-specific/linux/misc/makeInstallImage.sh.in 2010-10-28 20:58:38.779734339 +0200 | |
3 | @@ -28,11 +28,6 @@ | |
4 | # This script builds an image of the installed system into | |
5 | # the gen/buildroot directory. | |
6 | ||
7 | -if [ "`whoami`" != "root" ]; then | |
8 | - echo 'You must be root to build package' | |
9 | - exit 1 | |
10 | -fi | |
11 | - | |
12 | # Making an assumption that this program is being run in the gen directory | |
13 | BuildRootDir=.. | |
14 | BuiltFBDir=./firebird # Where the just build fb exists. | |
15 | @@ -113,7 +108,6 @@ | |
16 | for d in $Dirs; do | |
17 | Dir=${TargetDir}${d} | |
18 | mkdir -p $Dir | |
19 | - chown root:root $Dir | |
20 | chmod 0755 $Dir | |
21 | done | |
22 | } | |
23 | @@ -158,7 +152,6 @@ | |
24 | cp $BuiltFBDir/bin/isql ${TargetDir}@FB_BINDIR@/isql | |
25 | cp $BuiltFBDir/bin/qli ${TargetDir}@FB_BINDIR@/qli | |
26 | ||
27 | - chown root:root ${TargetDir}@FB_BINDIR@/* | |
28 | chmod 0755 ${TargetDir}@FB_BINDIR@/* | |
29 | ||
30 | #sbin | |
31 | @@ -177,7 +170,6 @@ | |
32 | cp $BuiltFBDir/bin/createAliasDB.sh ${TargetDir}@FB_SBINDIR@ | |
33 | cp $BuiltFBDir/bin/fb_config ${TargetDir}@FB_SBINDIR@ | |
34 | ||
35 | - chown root:root ${TargetDir}@FB_SBINDIR@/* | |
36 | chmod 0755 ${TargetDir}@FB_SBINDIR@/* | |
37 | chmod 0700 ${TargetDir}@FB_SBINDIR@/*.sh | |
38 | ||
39 | @@ -201,19 +193,16 @@ | |
40 | ||
41 | for i in `find ${TargetDir}@FB_SAMPLEDIR@ -type d -print` | |
42 | do | |
43 | - chown root:root $i | |
44 | chmod 0555 $i | |
45 | done | |
46 | for i in `find ${TargetDir}@FB_SAMPLEDIR@ -type f -print` | |
47 | do | |
48 | - chown root:root $i | |
49 | chmod 0444 $i | |
50 | done | |
51 | ||
52 | makeDirs @FB_SAMPLEDBDIR@ | |
53 | cp $BuiltFBDir/examples/empbuild/*.fdb ${TargetDir}@FB_SAMPLEDBDIR@ | |
54 | ||
55 | - chown root:root ${TargetDir}@FB_SAMPLEDBDIR@/*.fdb | |
56 | chmod 0444 ${TargetDir}@FB_SAMPLEDBDIR@/*.fdb | |
57 | fi | |
58 | ||
59 | @@ -221,13 +210,11 @@ | |
60 | copyIfExists $BuiltFBDir/help/help.gbak ${TargetDir}@FB_HELPDIR@ | |
61 | cp $BuiltFBDir/help/help.fdb ${TargetDir}@FB_HELPDIR@ | |
62 | ||
63 | - chown root:root ${TargetDir}@FB_HELPDIR@/*.fdb | |
64 | chmod 0444 ${TargetDir}@FB_HELPDIR@/*.fdb | |
65 | ||
66 | #message file | |
67 | cp $BuiltFBDir/*.msg ${TargetDir}@FB_MSGDIR@ | |
68 | ||
69 | - chown root:root ${TargetDir}@FB_MSGDIR@/*.msg | |
70 | chmod 0444 ${TargetDir}@FB_MSGDIR@/*.msg | |
71 | ||
72 | #secureDB (access rights will be set at install time) | |
73 | @@ -236,7 +223,6 @@ | |
74 | #.h files | |
75 | cp $BuiltFBDir/include/*.h ${TargetDir}@FB_INCDIR@ | |
76 | ||
77 | - chown root:root ${TargetDir}@FB_INCDIR@/*.h | |
78 | chmod 0444 ${TargetDir}@FB_INCDIR@/*.h | |
79 | ||
80 | #lib | |
81 | @@ -245,20 +231,17 @@ | |
82 | cp -f $BuiltFBDir/lib/libib_util.so ${TargetDir}@FB_LIBDIR@/libib_util.so | |
83 | copyIfExists $BuiltFBDir/lib/libicu*.so* ${TargetDir}@FB_LIBDIR@ | |
84 | ||
85 | - chown root:root ${TargetDir}@FB_LIBDIR@/*.so* | |
86 | chmod 0755 ${TargetDir}@FB_LIBDIR@/*.so* | |
87 | ||
88 | #plugins | |
89 | cp -df $BuiltFBDir/plugins/* ${TargetDir}@FB_PLUGDIR@ | |
90 | ||
91 | - chown root:root ${TargetDir}@FB_PLUGDIR@/*.so* | |
92 | chmod 0755 ${TargetDir}@FB_PLUGDIR@/*.so* | |
93 | ||
94 | #intl | |
95 | cp $BuiltFBDir/intl/libfbintl.so ${TargetDir}@FB_INTLDIR@/fbintl | |
96 | cp $BuildRootDir/gen/install/misc/fbintl.conf ${TargetDir}@FB_INTLDIR@ | |
97 | ||
98 | - chown root:root ${TargetDir}@FB_INTLDIR@/fbintl* | |
99 | chmod 0755 ${TargetDir}@FB_INTLDIR@/fbintl | |
100 | chmod 0644 ${TargetDir}@FB_INTLDIR@/fbintl.conf | |
101 | ||
102 | @@ -271,7 +254,6 @@ | |
103 | cp $BuildRootDir/src/extlib/ib_udf2.sql ${TargetDir}@FB_UDFDIR@ | |
104 | cp $BuildRootDir/src/extlib/fbudf/fbudf.sql ${TargetDir}@FB_UDFDIR@ | |
105 | ||
106 | - chown root:root ${TargetDir}@FB_UDFDIR@/*.so ${TargetDir}@FB_UDFDIR@/*.sql | |
107 | chmod 0755 ${TargetDir}@FB_UDFDIR@/*.so | |
108 | chmod 0644 ${TargetDir}@FB_UDFDIR@/*.sql | |
109 | ||
110 | @@ -282,9 +264,7 @@ | |
111 | cp $BuildRootDir/doc/WhatsNew ${TargetDir}@FB_CONFDIR@/WhatsNew | |
112 | cp $BuildRootDir/doc/README.user ${TargetDir}@FB_CONFDIR@/README | |
113 | ||
114 | - chown -R root:root ${TargetDir}@FB_MISCDIR@ | |
115 | for i in `find ${TargetDir}@FB_MISCDIR@ -print`; do | |
116 | - chown root:root $i | |
117 | if [ -d $i ]; then | |
118 | chmod 0755 $i | |
119 | else | |
120 | @@ -301,7 +281,6 @@ | |
121 | cp $BuildRootDir/gen/install/misc/firebird.init.d.* ${TargetDir}@FB_MISCDIR@ | |
122 | cp $BuildRootDir/gen/install/misc/rc.config.firebird ${TargetDir}@FB_MISCDIR@ | |
123 | ||
124 | - chown -R root:root ${TargetDir}@FB_MISCDIR@ | |
125 | chmod -R go-rwx ${TargetDir}@FB_MISCDIR@ | |
126 | ||
127 | #conf | |
128 | @@ -309,7 +288,6 @@ | |
129 | cp $BuildRootDir/gen/install/misc/aliases.conf ${TargetDir}@FB_CONFDIR@ | |
130 | cp $BuildRootDir/gen/install/misc/fbtrace.conf ${TargetDir}@FB_CONFDIR@ | |
131 | ||
132 | - chown root:root ${TargetDir}@FB_CONFDIR@/*.conf | |
133 | chmod 0644 ${TargetDir}@FB_CONFDIR@/*.conf | |
134 | ||
135 | # Create links from @libdir@ to install area. |