Skip to content

Update build install script name to match the current situation #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 27, 2021

Conversation

Tiryoh
Copy link
Contributor

@Tiryoh Tiryoh commented Oct 6, 2021

What does this implement/fix?

現状のインストールスクリプトには"raspbian"や"ubuntu"のようなキーワードが含まれ、OSによってスクリプトを使い分けるように見受けられます。
しかしながら実際にはLinuxカーネルのヘッダファイルのインストール方法によってスクリプトが使い分けられているため、現状にあわせた名前に変更します。
この変更後もビルドする際は utils/build_install.bash を実行するのみで、ほとんどのユーザの操作は変わりません。

The current installation script file name includes keywords such as "raspbian" and "ubuntu" and seems to be separate for different operating systems.
However, the scripts are separated according to the installation method of the linux header file, so this PR renames them to match the current situation.
Most users will still only need to run utils/build_install.bash to build.

before after
build_install.raspi4ubuntu.bash build_install_header_from_apt_raspi4.bash
build_install.ubuntu14.bash build_install_header_from_apt_raspi2.bash
build_install.raspbian.bash build_install_header_from_source_raspi2.bash
N/A build_install_header_from_source_raspi4.bash

Does this close any currently open issues?

No

How has this been tested?

以下の構成で実行されるスクリプト名を確認しました。

Checked the script name to be executed in the following configuration.

Raspberry Pi Mouse Raspberry Pi OS Script
V3 4 Model B Ubuntu 18.04 build_install_header_from_apt_raspi4.bash
V3 4 Model B Raspberry Pi OS Buster build_install_header_from_apt_raspi4.bash
V3 3 Model B Ubuntu 18.04 build_install_header_from_apt_raspi2.bash
V3 3 Model B Raspberry Pi OS Buster build_install_header_from_apt_raspi2.bash
V3 3 Model B Raspberry Pi OS Buster (Custom Kernel) build_install_header_from_source_raspi2.bash
V3 4 Model B Raspberry Pi OS Buster (Custom Kernel) build_install_header_from_source_raspi4.bash

2021-10-25-144118

Any other comments?

Checklists

  • I have read the CONTRIBUTING guidelines.
  • I have checked to ensure there aren't other open Pull Requests for the same change.

@Tiryoh Tiryoh added the Type: Refactoring A code change that neither fixes a bug nor adds a feature label Oct 6, 2021
@Tiryoh Tiryoh self-assigned this Oct 22, 2021
@Tiryoh Tiryoh marked this pull request as ready for review October 25, 2021 09:57
@Tiryoh Tiryoh requested a review from ShotaAk October 25, 2021 10:04
@Tiryoh Tiryoh assigned ShotaAk and unassigned Tiryoh Oct 25, 2021
# build and install the driver
cd $SRC_DIR/src/drivers/
rm Makefile
ln -s Makefile.header_from_apt Makefile
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

意図した差分が出ていないので、コメントで補足。
このファイルは旧build_install.ubunt14.bashの名前を変えたもので、
差分は11行目のln -s Makefile.ubuntu14 Makefileからln -s Makefile.header_from_apt Makefileへの変更のみ。

# build and install the driver
cd $SRC_DIR/src/drivers/
rm Makefile
ln -s Makefile.header_from_source Makefile
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

意図した差分が出ていないので、コメントで補足。
このファイルは旧build_install.raspbian.bashの名前を変えたもので、
差分は11行目のln -s Makefile.raspbian Makefileからln -s Makefile.header_from_source Makefileへの変更のみ。

Comment on lines +13 to +14
# Update for Raspberry Pi 4
sed -i -e "s/#define RASPBERRYPI 2/#define RASPBERRYPI 4/g" rtmouse.c
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

コメントで補足。
このファイルと、build_install_header_from_source_raspi2.bashの差分は13, 14行目のみ。

Copy link
Contributor

@ShotaAk ShotaAk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

良いと思います。

RasPi4 のUbuntu 20.04, Raspberry Pi OS環境で./build_install.bash実行後にbuild_install_header_from_apt_raspi4.bashが実行されることを確認しました。

@ShotaAk ShotaAk merged commit 53066c2 into master Oct 27, 2021
@ShotaAk ShotaAk deleted the feature/update-build-install-script-name branch October 27, 2021 02:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Type: Refactoring A code change that neither fixes a bug nor adds a feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants