From 910f5353a93766b63c3402d0e737209734aa5493 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Mon, 22 Mar 2010 14:35:33 +0100 Subject: ause117: #i110262# make noarch group writeable --- setup_native/scripts/makefile.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup_native/scripts/makefile.mk b/setup_native/scripts/makefile.mk index b8fc6649eddf..bd7808455ac0 100644 --- a/setup_native/scripts/makefile.mk +++ b/setup_native/scripts/makefile.mk @@ -50,7 +50,8 @@ UNIXTEXT= \ UNIXTEXT+= $(BIN)$/stclient_wrapper.sh .ENDIF -FAKEDB=$(BIN)$/noarch/fake-db-1.0-0.noarch.rpm +NOARCH=$(BIN)$/noarch +FAKEDB=$(NOARCH)/fake-db-1.0-0.noarch.rpm FAKEDBROOT=$(COMMONMISC)/$(TARGET)/fake-db-root # --- Targets ------------------------------------------------------ @@ -73,6 +74,7 @@ $(BIN)$/install: install_$(OS:l).sh $(FAKEDB) : fake-db.spec $(MKDIRHIER) $(FAKEDBROOT) $(RPM) --define "_builddir $(shell @cd $(FAKEDBROOT) && pwd)" --define "_rpmdir $(shell @cd $(BIN) && pwd)" -bb $< + chmod g+w $(NOARCH) $(BIN)$/install: $(FAKEDB) -- cgit v1.2.3 From 23de218d3a1f06ff0b6b0fbce35cc227a26c7baf Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Wed, 24 Mar 2010 11:36:05 +0100 Subject: ause117: #i110262# just call rpm if you want/have rpm --- setup_native/scripts/makefile.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup_native/scripts/makefile.mk b/setup_native/scripts/makefile.mk index bd7808455ac0..fc2081d4b559 100644 --- a/setup_native/scripts/makefile.mk +++ b/setup_native/scripts/makefile.mk @@ -70,6 +70,7 @@ $(BIN)$/install: install_$(OS:l).sh .ENDIF .IF "$(OS)" == "LINUX" +.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)" $(FAKEDB) : fake-db.spec $(MKDIRHIER) $(FAKEDBROOT) @@ -82,7 +83,8 @@ $(BIN)$/uninstall: uninstall_linux.sh $(TYPE) $< | tr -d "\015" > $@ -chmod 775 $@ -.ENDIF +.ENDIF # "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)" +.ENDIF # "$(OS)" == "LINUX" .IF "$(OS)" == "SOLARIS" -- cgit v1.2.3 From f573d06ba62efe9143efb73f10e74aa05185bb0e Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Wed, 24 Mar 2010 15:22:15 +0100 Subject: ause117: #i110262# more targets that require rpm --- setup_native/scripts/makefile.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup_native/scripts/makefile.mk b/setup_native/scripts/makefile.mk index fc2081d4b559..de91bd011efe 100644 --- a/setup_native/scripts/makefile.mk +++ b/setup_native/scripts/makefile.mk @@ -59,7 +59,7 @@ FAKEDBROOT=$(COMMONMISC)/$(TARGET)/fake-db-root .ENDIF # L10N_framework .INCLUDE : target.mk .IF "$(L10N_framework)"=="" -.IF "$(OS)" == "SOLARIS" || "$(OS)" == "LINUX" +.IF "$(OS)" == "SOLARIS" || ( "$(OS)" == "LINUX" && "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)" ) ALLTAR: $(BIN)$/install $(BIN)$/uninstall @@ -78,12 +78,12 @@ $(FAKEDB) : fake-db.spec chmod g+w $(NOARCH) $(BIN)$/install: $(FAKEDB) +.ENDIF # "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)" $(BIN)$/uninstall: uninstall_linux.sh $(TYPE) $< | tr -d "\015" > $@ -chmod 775 $@ -.ENDIF # "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)" .ENDIF # "$(OS)" == "LINUX" .IF "$(OS)" == "SOLARIS" -- cgit v1.2.3